Feature/orange cloud

Same as previous