Adding more functions/testing up to 40,000