Forgot to rename some vars