Changed function names back