See if this makes it faster.