Rewrite. New options, avoiding creation of new events, etc