Last minute changes / hacks for demo purposes