added analyst and changed class files