more state manager work, its simpler to use now