CloudService 100% merged