Moved over the new changes to simple-example