State system tweak