edited function names