Amr alaa integration

@aelnouby Review and merge