selectors updated on 17-18