better integration with Gambit (incomplete)