reorder configuration steps so that it works on new machines