back to basics
separate condition for move