Changes from doc