revert back to using single selector