I think you can just go into normalState here, that would be simpler, or am I missing something?