Another speed up (18/36)

Another speed up