Revamped FSMs on hero