tidied for demo site