updated to better variable names