[Issue #209][WIP] Salma fixed the edit