More improvemets to selection