Anthony - added text
Merged conflict and did stuff