[#34] changed fsm to now call super-state methods