Make it faster