Improved time (27/28)

Improved time