Changes to CalMomentAnalysis