Initial revision of toolbox