Change to use existing selector