Lovely speed up (16/28)

Lovely speed up