New Selector | Bug Fixes