Kareem newbranch

@MahmoudGamalEid  please review and merge