Changed function names to make it clearer what they do