polished and used state/manager