Working on increasing selection performance