Tidied up the demo