Updated for tengbe class changes.