Improved time (14/28)

Improved time