Normalize

Now ready for merge.