changed a few function names