Merging modifications done here and there.