few more additions in FSM