Changed equations to have better variable names