Added NKK-specific changes