WIP remove unneeded states
WIP add standby override control