Another speed up (6/36)

Another speed up