bringing the encapsulation branch into line.