Final Commit with the old GoAT