More work on NPCs