mail changes and match model change