Tidied up after mac switch