rework demo to new npc controller