Updated to fix some ns issues.