Updated implementation of Move and Moves