Tidied up version

Forgot I experimented further on a different machine...