Undid the encapsulation to reduce size of pull request