Adding tim's updates