added context to selectors