reduced the number of selectors a little bit