Changed doc according to comments