editing encapsulation to fit with new branch