Another speed up (24/36)

Another speed up