update to use Jeff's clean  model