Starting to make it faster.