Improved time (23/28)

Improved time