Improved time (16/28)

Improved time