Integration of Gossie contribution (from mpcclub)