slight reorganisation of states | ScratchStats