Good point, definitely will save us from inconsistent states.