update to 16A
updates for 16B