Some private methods turned to public