Reswitch to circus as i fixed the startup bug !

@toutpt i also cleaned up a bit the states, tell me if it is more easily readable