Rewrite old selector