Another speed up (20/36)

Another speed up