Another speed up (33/36)

Another speed up