update to code reflecting new class structure.