Updating from CloudSpokes work