Adding your edits back in

These were removed when you merged my stuff.