NPC 2 and structure overhaul