improve message when state changes