Changed function names to be wayyyy better