Made changes to Analytic Options