Tidied up 1.0