Improved time (18/28)

Improved time