Ha update close to getting the encapsulation