changed class structure.