Update for gambit changes