Changes to extract and analysis script for new data