gt2 update from @nophead