Fixing Documentation as Fathy asked