erics suggestions + improve doc