Merged?

Double check it please.