The old model churn renamed and a realistic trace churn model added