Better, more complete doc