Unique Generator rewrite