tidied up, seems to work now