El Adaima addition
fix csv
Merge branch 'cr'