changes to the content
fixed merge conflicts with bellamy