changed function names for consistency