Fix What You Have First