Changed function names for clarity