Lovely speed up (17/28)

Lovely speed up