hazmat major update
merge