Improved FSM, added group for executive