second round of azadeh changes