reordered setup steps