Improving moves controller