added selection and highlight feature