changes squashed