final updates for 16.1