updated macroses associated with time calculation