redo some gnl changes lost in wrong commit