Rewrite

Rewrite in progress.