Simplified the move logic