Merge with new code.