Master merge, take 2