New version of the selector