Getting ready for 2nd merge.