several changes necessitated by the new version of Selector