improve gl current tracking