Some extending and tuning of model