Finished most changes for new special update invariants