updated according to new selectors