improved toolbox creation