This now installs in a single run.