Final revisions prior to demo