Simplify time management
Update doc