CW: More documentation