Alternative version for the multiple selection and other improvements