Updated variable names