Improved time (15/28)

Improved time