Changed function names for uniformity