Updated selectors draft