merge
merged with NBT changes