Chainloading works so tidy up some bits and pieces