More work with obj_npc