added current generator and goallist, v8 and v8.1 respectively