Toolboxes changed, code simplified