Modified for fix ave/time/saed updates