Changed the selection framework