Final changes

Final changes for the demo