Minimal changes to Toolbox logic.