few fixes
few fixes
can reuse class assignment from previous period