Added selection and deletion