classes A & C changes