Tidied up demo