shifted extraneous functions to toolbox