Doing maybe a little bit better with state transitions