Improved time (24/28)

Improved time