merge with D & INOCCHI