cleaned up the function names to make sense