Ensure the correct movement methods are called