changes reflecting the requirements to merge.