Working on fixing NPC planning