Tidied up 107