Remodel - am I doing it wrong?