improvement to selector