merging prior changes.