removed old code, beefed up make model.