Merged?

I hope it's good.