Tidied up
Work in progress