Forgot to refactor some variables