Merging latest work.