amended observer class files
