Lovely speed up (4/28)

Lovely speed up