simplify timemanagement (take 2)