Site redesign for NASP