Updated preview move method and refactored