Merge original author's changes.