renaming some functions to be more appropriate
fix merge conflicts