with new variable and function names