updated walid and ml edits, now paola