rename methods and add functions