changing function names
performance improvement