adding changes to toolbox final version