Make functions public + #13