Fixed cloud offset
merge
Merge both