state 1, some further adjustments