tidied up system