relax dependencies a bit
state handler