Properly bundle updates (calculate our own timedelta)