Changes made for upgrade study. Major changes in FutureAnalysis package.