Commented out parts of my code for speed