changed all move logic