FSM added to salvum-main