intermittent merge

stable version with test NPC for journal