Improve Time Management

Improve Time Management