- Updated NOA source