Slight modifications Analysis.cs