FIX - Making some private methods public