Fixed 04 -added some stuff
Fixed 05: Updates to Analyser