Re-worked some of the examples