added containment for toolbox