move client change handling out of serverTime