Upgraded Correspondence and fixed bugs related to changes.