Mem7 master

fixed master, @tokaabdelgabar  @Riham-Gamal  please add your removed stuff to normal master