Decoupled MassUpdate code moved here