Update for GameChanger fork

Review @confucious