Rewrite for ecupid