Amr alaa integration

Finializing