Forgot to change a few vars...oops