#7 fix visibility of some of the functions