Clean model, some updating