Updated npc and player