Now works very well with Cloud