Improved time (20/28)

Improved time