Update to semi final demo

Update to semi final demo, reviewed by Eric