improved management of system state