Updated demo, fix for controller