updated function names for consistency