switched back to old selector