Updated version for 6.5-gm-1.