Improved the move methods