Made example changes
Merged jonas changes with mine