Another speed up (25/36)

Another speed up