Forgot to rename a few variables