Merging changes with new code.