moving time to end of formulas for consistency