Gabes additions to the stub