updated macroses associated with elav time