adding Theresa's new changes .
Fixed Merge Conflict