stop logic broken after piling it on with new states.