Improved selection mode