updated docs for previous merge