change method names and visibility