restructuring for hybrid_control