Remove need for old mass

Minimal change so that don't need to send the old mass. Backward compatible.