Updated analysis scripts