Changed paths to work with new directory structure. Removed throttle.