sinplify timemanagement (take 3)