Restore alignment

I forgot how to Github and merged the original branch before it was ready.

@tranma