changing analysis classes and others