put in new fox model
fix merge conflicts