updated/cleaned up for toolbox stuff