Fixed Jack's second mistake of renaming my variables