changed visibility of some functions