better state handling at home