Merged with updated original.