Tightening pass on Gambler