azadeh s and miquel s changes