Added multiple other states + transitions