The content of events now wrap
Fixed Merge Conflicts