Didn't change variable names everywhere