updated the move and setPos functions
fixed merge conflicts