modals ready
Merge branch 'Abdel_Branch'