Switch from private functions to public methods

Switch from private functions to public methods ;-)