many selectors refactored to be functions again