Selection improved