merged tim's additions