These changes should be moved up to the b16 section.