Modified to have better variable names