some minor changes in the class structure.