modified the move class to get rid of the unnecessary changes