change function names a little