Fixed the merge between the two versions, Jons changes and Adams changes.