Added back the SaveAnalytical stuff