cleaned up mk2_controller