added npc stuff