Update for 40_16; documentation