added support for multiple selection