Changes and hacks for initial demo