Lovely speed up (24/28)

Lovely speed up