NPC and its puppet added