Changed function names to be more descriptive