Switch to this way to try and make it faster.