Better time.calculate markup