MOAR CHANGES before reinstall