improve on selection feature