Changes to analysis tool from Aug 15