Fixed conflicts
Changed timings on above-cloud section