tidied up cloud support