tidied up: ready for content