Updated selector