FEATURE: Added on_mode