Revert "Revert "Final draft committed.""

This reverts commit b5358ec7f12c88314896856fc65fb9c40e594edb.