Just renamed some of the functions to make them less confusing