Update for gl6.1