Re-Tool or Re-Align?