corrections on encapsulation