Updated function names for clarity