issue-15 reverting methods to private