Tidied up 104