tidied up for demo