Getting ready for NPC merge