Rewrote to use a ScopeSelector`