added changes from NBT
merged with changes from NBT