adding remove_tool and move_tool