tidied up yesterday's changes