added tim's updates