changed function names