Performance -- Fix all redundant state changes
Version