Changed visibility of functions