Fixed missing change
More writing and proof reading
Merge