Fixed major error in analytic piece