Cloud Factory modified