Updates for cheddar, but the doc is really inconsistent right now.