encapsulation improvements