Added comments and methods from doc