Select Tool upgrade