Huge improvement to the demo