Lovely speed up (7/28)

Lovely speed up