Fixed visibility of methods - partial commit
Fixed visibility of methods - partial commit