Edits as per Cathrin's comments
Pulled changes + made edits based on comments