moved to using Selector