Improved selector.