Made scope of selector smaller