Lovely speed up (11/28)

Lovely speed up