adjustments to tool_origin functionality