Still improving encapsulation