diff --git a/docs/source/io_formats/settings.rst b/docs/source/io_formats/settings.rst
index 2a85ebc8a..1016fbaa3 100644
--- a/docs/source/io_formats/settings.rst
+++ b/docs/source/io_formats/settings.rst
@@ -449,24 +449,27 @@ attributes/sub-elements:
 
     *Default*: 1.0
 
+  :type:
+    Indicator of source type. One of ``independent``, ``file``, or ``compiled``.
+
   :particle:
     The source particle type, either ``neutron`` or ``photon``.
 
     *Default*: neutron
 
   :file:
-    If this attribute is given, it indicates that the source is to be read from
-    a binary source file whose path is given by the value of this element. Note,
-    the number of source sites needs to be the same as the number of particles
-    simulated in a fission source generation.
+    If this attribute is given, it indicates that the source type is ``file``,
+    meaning particles are to be read from a binary source file whose path is
+    given by the value of this element.
 
     *Default*: None
 
   :library:
-    If this attribute is given, it indicates that the source is to be
-    instantiated from an externally compiled source function. This source can be
-    as complex as is required to define the source for your problem. The library
-    has a few basic requirements:
+    If this attribute is given, it indicates that the source type is
+    ``compiled``, meaning that particles are instantiated from an externally
+    compiled source function. This source can be completely customized as needed
+    to define the source for your problem. The library has a few basic
+    requirements:
 
     * It must contain a class that inherits from ``openmc::Source``;
     * The class must implement a function called ``sample()``;
@@ -476,14 +479,12 @@ attributes/sub-elements:
 
     More documentation on how to build sources can be found in :ref:`custom_source`.
 
-    *Default*: None
-
   :parameters:
-    If this attribute is given, it provides the parameters to pass through to the
-    class generated using the ``library`` parameter . More documentation on how to
-    build parametrized sources can be found in :ref:`parameterized_custom_source`.
-
-    *Default*: None
+    If this attribute is given, it indicated that the source type is
+    ``compiled``. Its value provides the parameters to pass through to the class
+    generated using the ``library`` parameter. More documentation on how to
+    build parametrized sources can be found in
+    :ref:`parameterized_custom_source`.
 
   :space:
     An element specifying the spatial distribution of source sites. This element
diff --git a/examples/assembly/assembly.py b/examples/assembly/assembly.py
index ec1bb7e9f..1355374f1 100644
--- a/examples/assembly/assembly.py
+++ b/examples/assembly/assembly.py
@@ -112,7 +112,7 @@ def assembly_model():
     model.settings.batches = 150
     model.settings.inactive = 50
     model.settings.particles = 1000
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         (-pitch/2, -pitch/2, -1),
         (pitch/2, pitch/2, 1),
         only_fissionable=True
diff --git a/examples/custom_source/build_xml.py b/examples/custom_source/build_xml.py
index a0817d422..e9a9a0656 100644
--- a/examples/custom_source/build_xml.py
+++ b/examples/custom_source/build_xml.py
@@ -18,7 +18,7 @@ settings = openmc.Settings()
 settings.run_mode = 'fixed source'
 settings.batches = 10
 settings.particles = 1000
-source = openmc.Source()
+source = openmc.IndependentSource()
 source.library = 'build/libsource.so'
 settings.source = source
 settings.export_to_xml()
diff --git a/examples/parameterized_custom_source/build_xml.py b/examples/parameterized_custom_source/build_xml.py
index 5edb204df..3c67e244d 100644
--- a/examples/parameterized_custom_source/build_xml.py
+++ b/examples/parameterized_custom_source/build_xml.py
@@ -18,7 +18,7 @@ settings = openmc.Settings()
 settings.run_mode = 'fixed source'
 settings.batches = 10
 settings.particles = 1000
-source = openmc.Source()
+source = openmc.IndependentSource()
 source.library = 'build/libparameterized_source.so'
 source.parameters = 'radius=3.0, energy=14.08e6'
 settings.source = source
diff --git a/include/openmc/source.h b/include/openmc/source.h
index 96d659dcb..ad2aae562 100644
--- a/include/openmc/source.h
+++ b/include/openmc/source.h
@@ -115,26 +115,26 @@ private:
 //! Wrapper for custom sources that manages opening/closing shared library
 //==============================================================================
 
-class CustomSourceWrapper : public Source {
+class CompiledSourceWrapper : public Source {
 public:
   // Constructors, destructors
-  CustomSourceWrapper(std::string path, std::string parameters);
-  ~CustomSourceWrapper();
+  CompiledSourceWrapper(std::string path, std::string parameters);
+  ~CompiledSourceWrapper();
 
   // Defer implementation to custom source library
   SourceSite sample(uint64_t* seed) const override
   {
-    return custom_source_->sample(seed);
+    return compiled_source_->sample(seed);
   }
 
-  double strength() const override { return custom_source_->strength(); }
+  double strength() const override { return compiled_source_->strength(); }
 
 private:
   void* shared_library_; //!< library from dlopen
-  unique_ptr<Source> custom_source_;
+  unique_ptr<Source> compiled_source_;
 };
 
-typedef unique_ptr<Source> create_custom_source_t(std::string parameters);
+typedef unique_ptr<Source> create_compiled_source_t(std::string parameters);
 
 //==============================================================================
 // Functions
diff --git a/openmc/examples.py b/openmc/examples.py
index 3b73d043f..cef86a47a 100644
--- a/openmc/examples.py
+++ b/openmc/examples.py
@@ -76,7 +76,7 @@ def pwr_pin_cell():
     model.settings.batches = 10
     model.settings.inactive = 5
     model.settings.particles = 100
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         [-pitch/2, -pitch/2, -1], [pitch/2, pitch/2, 1], only_fissionable=True))
 
     plot = openmc.Plot.from_geometry(model.geometry)
@@ -415,7 +415,7 @@ def pwr_core():
     model.settings.batches = 10
     model.settings.inactive = 5
     model.settings.particles = 100
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         [-160, -160, -183], [160, 160, 183]))
 
     plot = openmc.Plot()
@@ -527,7 +527,7 @@ def pwr_assembly():
     model.settings.batches = 10
     model.settings.inactive = 5
     model.settings.particles = 100
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         [-pitch/2, -pitch/2, -1], [pitch/2, pitch/2, 1], only_fissionable=True))
 
     plot = openmc.Plot()
@@ -629,7 +629,7 @@ def slab_mg(num_regions=1, mat_names=None, mgxslib_name='2g.h5'):
     INF = 1000.
     bounds = [0., -INF, -INF, rads[0], INF, INF]
     uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:])
-    settings_file.source = openmc.source.Source(space=uniform_dist)
+    settings_file.source = openmc.IndependentSource(space=uniform_dist)
 
     settings_file.output = {'summary': False}
 
diff --git a/openmc/settings.py b/openmc/settings.py
index fbbb0c719..7937cd2e7 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -13,8 +13,8 @@ import lxml.etree as ET
 import openmc.checkvalue as cv
 from openmc.stats.multivariate import MeshSpatial
 
-from . import (RegularMesh, Source, VolumeCalculation, WeightWindows,
-               WeightWindowGenerator)
+from . import (RegularMesh, SourceBase, IndependentSource,
+               VolumeCalculation, WeightWindows, WeightWindowGenerator)
 from ._xml import clean_indentation, get_text, reorder_attributes
 from openmc.checkvalue import PathLike
 from .mesh import _read_meshes
@@ -150,7 +150,7 @@ class Settings:
         The type of calculation to perform (default is 'eigenvalue')
     seed : int
         Seed for the linear congruential pseudorandom number generator
-    source : Iterable of openmc.Source
+    source : Iterable of openmc.SourceBase
         Distribution of source sites in space, angle, and energy
     sourcepoint : dict
         Options for writing source points. Acceptable keys are:
@@ -265,7 +265,7 @@ class Settings:
         self._max_order = None
 
         # Source subelement
-        self._source = cv.CheckedList(Source, 'source distributions')
+        self._source = cv.CheckedList(SourceBase, 'source distributions')
 
         self._confidence_intervals = None
         self._electron_treatment = None
@@ -459,14 +459,14 @@ class Settings:
         self._max_order = max_order
 
     @property
-    def source(self) -> typing.List[Source]:
+    def source(self) -> typing.List[SourceBase]:
         return self._source
 
     @source.setter
-    def source(self, source: typing.Union[Source, typing.Iterable[Source]]):
+    def source(self, source: typing.Union[SourceBase, typing.Iterable[SourceBase]]):
         if not isinstance(source, MutableSequence):
             source = [source]
-        self._source = cv.CheckedList(Source, 'source distributions', source)
+        self._source = cv.CheckedList(SourceBase, 'source distributions', source)
 
     @property
     def confidence_intervals(self) -> bool:
@@ -969,7 +969,7 @@ class Settings:
         if not isinstance(wwgs, MutableSequence):
             wwgs = [wwgs]
         self._weight_window_generators = cv.CheckedList(WeightWindowGenerator, 'weight window generators', wwgs)
-        
+
     def _create_run_mode_subelement(self, root):
         elem = ET.SubElement(root, "run_mode")
         elem.text = self._run_mode.value
@@ -1024,7 +1024,7 @@ class Settings:
     def _create_source_subelement(self, root):
         for source in self.source:
             root.append(source.to_xml_element())
-            if isinstance(source.space, MeshSpatial):
+            if isinstance(source, IndependentSource) and isinstance(source.space, MeshSpatial):
                 path = f"./mesh[@id='{source.space.mesh.id}']"
                 if root.find(path) is None:
                     root.append(source.space.mesh.to_xml_element())
@@ -1402,7 +1402,7 @@ class Settings:
 
     def _source_from_xml_element(self, root, meshes=None):
         for elem in root.findall('source'):
-            src = Source.from_xml_element(elem, meshes)
+            src = SourceBase.from_xml_element(elem, meshes)
             # add newly constructed source object to the list
             self.source.append(src)
 
diff --git a/openmc/source.py b/openmc/source.py
index 150830cc8..0e17938a8 100644
--- a/openmc/source.py
+++ b/openmc/source.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+from abc import ABC, abstractmethod
 from collections.abc import Iterable
 from enum import IntEnum
 from numbers import Real
@@ -16,9 +18,107 @@ from openmc.checkvalue import PathLike
 from openmc.stats.multivariate import UnitSphere, Spatial
 from openmc.stats.univariate import Univariate
 from ._xml import get_text
+from .mesh import MeshBase
 
 
-class Source:
+class SourceBase(ABC):
+    """Base class for external sources
+
+    Parameters
+    ----------
+    strength : float
+        Strength of the source
+
+    Attributes
+    ----------
+    type : {'independent', 'file', 'compiled'}
+        Indicator of source type.
+    strength : float
+        Strength of the source
+
+    """
+
+    def __init__(self, strength=1.0):
+        self.strength = strength
+
+    @property
+    def strength(self):
+        return self._strength
+
+    @strength.setter
+    def strength(self, strength):
+        cv.check_type('source strength', strength, Real)
+        cv.check_greater_than('source strength', strength, 0.0, True)
+        self._strength = strength
+
+    @abstractmethod
+    def populate_xml_element(self, element):
+        """Add necessary source information to an XML element
+
+        Returns
+        -------
+        element : lxml.etree._Element
+            XML element containing source data
+
+        """
+        pass
+
+    def to_xml_element(self) -> ET.Element:
+        """Return XML representation of the source
+
+        Returns
+        -------
+        element : xml.etree.ElementTree.Element
+            XML element containing source data
+
+        """
+        element = ET.Element("source")
+        element.set("type", self.type)
+        element.set("strength", str(self.strength))
+        self.populate_xml_element(element)
+        return element
+
+    @classmethod
+    def from_xml_element(cls, elem: ET.Element, meshes=None) -> openmc.SourceBase:
+        """Generate source from an XML element
+
+        Parameters
+        ----------
+        elem : lxml.etree._Element
+            XML element
+        meshes : dict
+            Dictionary with mesh IDs as keys and openmc.MeshBase instances as
+            values
+
+        Returns
+        -------
+        openmc.SourceBase
+            Source generated from XML element
+
+        """
+        source_type = get_text(elem, 'type')
+
+        if source_type is None:
+            # attempt to determine source type based on attributes
+            # for backward compatibility
+            if get_text(elem, 'file') is not None:
+                return FileSource.from_xml_element(elem)
+            elif get_text(elem, 'library') is not None:
+                return CompiledSource.from_xml_element(elem)
+            else:
+                return IndependentSource.from_xml_element(elem)
+        else:
+            if source_type == 'independent':
+                return IndependentSource.from_xml_element(elem, meshes)
+            elif source_type == 'compiled':
+                return CompiledSource.from_xml_element(elem)
+            elif source_type == 'file':
+                return FileSource.from_xml_element(elem)
+            else:
+                raise ValueError(f'Source type {source_type} is not recognized')
+
+
+class IndependentSource(SourceBase):
     """Distribution of phase space coordinates for source sites.
 
     Parameters
@@ -31,14 +131,6 @@ class Source:
         Energy distribution of source sites
     time : openmc.stats.Univariate
         time distribution of source sites
-    filename : str
-        Source file from which sites should be sampled
-    library : str
-        Path to a custom source library
-    parameters : str
-        Parameters to be provided to the custom source library
-
-        .. versionadded:: 0.12
     strength : float
         Strength of the source
     particle : {'neutron', 'photon'}
@@ -57,14 +149,13 @@ class Source:
         Energy distribution of source sites
     time : openmc.stats.Univariate or None
         time distribution of source sites
-    file : str or None
-        Source file from which sites should be sampled
-    library : str or None
-        Path to a custom source library
-    parameters : str
-        Parameters to be provided to the custom source library
     strength : float
         Strength of the source
+    type : str
+        Indicator of source type: 'independent'
+
+    .. versionadded:: 0.13.4
+
     particle : {'neutron', 'photon'}
         Source particle type
     ids : Iterable of int
@@ -80,20 +171,16 @@ class Source:
         angle: Optional[openmc.stats.UnitSphere] = None,
         energy: Optional[openmc.stats.Univariate] = None,
         time: Optional[openmc.stats.Univariate] = None,
-        filename: Optional[str] = None,
-        library: Optional[str] = None,
-        parameters: Optional[str] = None,
         strength: float = 1.0,
         particle: str = 'neutron',
         domains: Optional[Sequence[typing.Union[openmc.Cell, openmc.Material, openmc.Universe]]] = None
     ):
+        super().__init__(strength)
+
         self._space = None
         self._angle = None
         self._energy = None
         self._time = None
-        self._file = None
-        self._library = None
-        self._parameters = None
 
         if space is not None:
             self.space = space
@@ -103,12 +190,6 @@ class Source:
             self.energy = energy
         if time is not None:
             self.time = time
-        if filename is not None:
-            self.file = filename
-        if library is not None:
-            self.library = library
-        if parameters is not None:
-            self.parameters = parameters
         self.strength = strength
         self.particle = particle
 
@@ -124,31 +205,25 @@ class Source:
             self.domain_ids = [d.id for d in domains]
 
     @property
-    def file(self):
-        return self._file
+    def type(self) -> str:
+        return 'independent'
 
-    @file.setter
-    def file(self, filename):
-        cv.check_type('source file', filename, str)
-        self._file = filename
+    def __getattr__(self, name):
+        cls_names = {'file': 'FileSource', 'library': 'CompiledSource',
+                     'parameters': 'CompiledSource'}
+        if name in cls_names:
+            raise AttributeError(
+                f'The "{name}" attribute has been deprecated on the '
+                f'IndependentSource class. Please use the {cls_names[name]} class.')
+        else:
+            super().__getattribute__(name)
 
-    @property
-    def library(self):
-        return self._library
-
-    @library.setter
-    def library(self, library_name):
-        cv.check_type('library', library_name, str)
-        self._library = library_name
-
-    @property
-    def parameters(self):
-        return self._parameters
-
-    @parameters.setter
-    def parameters(self, parameters_path):
-        cv.check_type('parameters', parameters_path, str)
-        self._parameters = parameters_path
+    def __setattr__(self, name, value):
+        if name in ('file', 'library', 'parameters'):
+            # Ensure proper AttributeError is thrown
+            getattr(self, name)
+        else:
+            super().__setattr__(name, value)
 
     @property
     def space(self):
@@ -186,16 +261,6 @@ class Source:
         cv.check_type('time distribution', time, Univariate)
         self._time = time
 
-    @property
-    def strength(self):
-        return self._strength
-
-    @strength.setter
-    def strength(self, strength):
-        cv.check_type('source strength', strength, Real)
-        cv.check_greater_than('source strength', strength, 0.0, True)
-        self._strength = strength
-
     @property
     def particle(self):
         return self._particle
@@ -223,25 +288,16 @@ class Source:
         cv.check_value('domain type', domain_type, ('cell', 'material', 'universe'))
         self._domain_type = domain_type
 
-    def to_xml_element(self) -> ET.Element:
-        """Return XML representation of the source
-
+    def populate_xml_element(self, element):
+        """Add necessary source information to an XML element
         Returns
         -------
         element : lxml.etree._Element
             XML element containing source data
 
         """
-        element = ET.Element("source")
-        element.set("strength", str(self.strength))
-        if self.particle != 'neutron':
-            element.set("particle", self.particle)
-        if self.file is not None:
-            element.set("file", self.file)
-        if self.library is not None:
-            element.set("library", self.library)
-        if self.parameters is not None:
-            element.set("parameters", self.parameters)
+        super().populate_xml_element(element)
+        element.set("particle", self.particle)
         if self.space is not None:
             element.append(self.space.to_xml_element())
         if self.angle is not None:
@@ -255,10 +311,9 @@ class Source:
             dt_elem.text = self.domain_type
             id_elem = ET.SubElement(element, "domain_ids")
             id_elem.text = ' '.join(str(uid) for uid in self.domain_ids)
-        return element
 
     @classmethod
-    def from_xml_element(cls, elem: ET.Element, meshes=None) -> 'openmc.Source':
+    def from_xml_element(cls, elem: ET.Element, meshes=None) -> 'openmc.SourceBase':
         """Generate source from an XML element
 
         Parameters
@@ -306,14 +361,6 @@ class Source:
         if filename is not None:
             source.file = filename
 
-        library = get_text(elem, 'library')
-        if library is not None:
-            source.library = library
-
-        parameters = get_text(elem, 'parameters')
-        if parameters is not None:
-            source.parameters = parameters
-
         space = elem.find('space')
         if space is not None:
             source.space = Spatial.from_xml_element(space, meshes)
@@ -333,6 +380,210 @@ class Source:
         return source
 
 
+def Source(*args, **kwargs):
+    """
+    A function for backward compatibility of sources. Will be removed in the
+    future. Please update to IndependentSource.
+    """
+    warnings.warn("This class is deprecated in favor of 'IndependentSource'", FutureWarning)
+    return openmc.IndependentSource(*args, **kwargs)
+
+
+class CompiledSource(SourceBase):
+    """A source based on a compiled shared library
+
+    .. versionadded:: 0.13.4
+
+    Parameters
+    ----------
+    library : str or None
+        Path to a compiled shared library
+    parameters : str
+        Parameters to be provided to the compiled shared library function
+    strength : float
+        Strength of the source
+
+    Attributes
+    ----------
+    library : str or None
+        Path to a compiled shared library
+    parameters : str
+        Parameters to be provided to the compiled shared library function
+    strength : float
+        Strength of the source
+    type : str
+        Indicator of source type: 'compiled'
+
+    """
+    def __init__(self, library: Optional[str] = None, parameters: Optional[str] = None, strength=1.0) -> None:
+        super().__init__(strength=strength)
+
+        self._library = None
+        if library is not None:
+            self.library = library
+
+        self._parameters = None
+        if parameters is not None:
+            self.parameters = parameters
+
+    @property
+    def type(self) -> str:
+        return "compiled"
+
+    @property
+    def library(self) -> str:
+        return self._library
+
+    @library.setter
+    def library(self, library_name):
+        cv.check_type('library', library_name, str)
+        self._library = library_name
+
+    @property
+    def parameters(self) -> str:
+        return self._parameters
+
+    @parameters.setter
+    def parameters(self, parameters_path):
+        cv.check_type('parameters', parameters_path, str)
+        self._parameters = parameters_path
+
+    def populate_xml_element(self, element):
+        """Add necessary compiled source information to an XML element
+
+        Returns
+        -------
+        element : lxml.etree._Element
+            XML element containing source data
+
+        """
+        super().populate_xml_element(element)
+
+        element.set("library", self.library)
+
+        if self.parameters is not None:
+            element.set("parameters", self.parameters)
+
+    @classmethod
+    def from_xml_element(cls, elem: ET.Element, meshes=None) -> openmc.CompiledSource:
+        """Generate a compiled source from an XML element
+
+        Parameters
+        ----------
+        elem : lxml.etree._Element
+            XML element
+        meshes : dict
+            Dictionary with mesh IDs as keys and openmc.MeshBase instances as
+            values
+
+        Returns
+        -------
+        openmc.CompiledSource
+            Source generated from XML element
+
+        """
+        library = get_text(elem, 'library')
+
+        source = cls(library)
+
+        strength = get_text(elem, 'strength')
+        if strength is not None:
+            source.strength = float(strength)
+
+        parameters = get_text(elem, 'parameters')
+        if parameters is not None:
+            source.parameters = parameters
+
+        return source
+
+
+class FileSource(SourceBase):
+    """A source based on particles stored in a file
+
+    .. versionadded:: 0.13.4
+
+    Parameters
+    ----------
+    path : str or pathlib.Path
+        Path to the source file from which sites should be sampled
+    strength : float
+        Strength of the source (default is 1.0)
+
+    Attributes
+    ----------
+    path : Pathlike
+        Source file from which sites should be sampled
+    strength : float
+        Strength of the source
+    type : str
+        Indicator of source type: 'file'
+
+    """
+    def __init__(self, path: Optional[PathLike] = None, strength=1.0) -> None:
+        super().__init__(strength=strength)
+
+        self._path = None
+
+        if path is not None:
+            self.path = path
+
+    @property
+    def type(self) -> str:
+        return "file"
+
+    @property
+    def path(self) -> PathLike:
+        return self._path
+
+    @path.setter
+    def path(self, p: PathLike):
+        cv.check_type('source file', p, str)
+        self._path = p
+
+    def populate_xml_element(self, element):
+        """Add necessary file source information to an XML element
+
+        Returns
+        -------
+        element : lxml.etree._Element
+            XML element containing source data
+
+        """
+        super().populate_xml_element(element)
+
+        if self.path is not None:
+            element.set("file", self.path)
+
+    @classmethod
+    def from_xml_element(cls, elem: ET.Element) -> openmc.FileSource:
+        """Generate file source from an XML element
+
+        Parameters
+        ----------
+        elem : lxml.etree._Element
+            XML element
+        meshes : dict
+            Dictionary with mesh IDs as keys and openmc.MeshBase instances as
+            values
+
+        Returns
+        -------
+        openmc.FileSource
+            Source generated from XML element
+
+        """
+
+        filename = get_text(elem, 'file')
+
+        source = cls(filename)
+
+        strength = get_text(elem, 'strength')
+        if strength is not None:
+            source.strength = float(strength)
+
+        return source
+
+
 class ParticleType(IntEnum):
     """
     IntEnum class representing a particle type. Type
diff --git a/src/settings.cpp b/src/settings.cpp
index e16afbedc..1c039e9ba 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -458,7 +458,7 @@ void read_settings_xml(pugi::xml_node root)
 
       // Create custom source
       model::external_sources.push_back(
-        make_unique<CustomSourceWrapper>(path, parameters));
+        make_unique<CompiledSourceWrapper>(path, parameters));
     } else {
       model::external_sources.push_back(make_unique<IndependentSource>(node));
     }
diff --git a/src/source.cpp b/src/source.cpp
index 163c85676..817847b76 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -326,10 +326,10 @@ SourceSite FileSource::sample(uint64_t* seed) const
 }
 
 //==============================================================================
-// CustomSourceWrapper implementation
+// CompiledSourceWrapper implementation
 //==============================================================================
 
-CustomSourceWrapper::CustomSourceWrapper(
+CompiledSourceWrapper::CompiledSourceWrapper(
   std::string path, std::string parameters)
 {
 #ifdef HAS_DYNAMIC_LINKING
@@ -343,7 +343,7 @@ CustomSourceWrapper::CustomSourceWrapper(
   dlerror();
 
   // get the function to create the custom source from the library
-  auto create_custom_source = reinterpret_cast<create_custom_source_t*>(
+  auto create_compiled_source = reinterpret_cast<create_compiled_source_t*>(
     dlsym(shared_library_, "openmc_create_source"));
 
   // check for any dlsym errors
@@ -356,7 +356,7 @@ CustomSourceWrapper::CustomSourceWrapper(
   }
 
   // create a pointer to an instance of the custom source
-  custom_source_ = create_custom_source(parameters);
+  compiled_source_ = create_compiled_source(parameters);
 
 #else
   fatal_error("Custom source libraries have not yet been implemented for "
@@ -364,11 +364,11 @@ CustomSourceWrapper::CustomSourceWrapper(
 #endif
 }
 
-CustomSourceWrapper::~CustomSourceWrapper()
+CompiledSourceWrapper::~CompiledSourceWrapper()
 {
   // Make sure custom source is cleared before closing shared library
-  if (custom_source_.get())
-    custom_source_.reset();
+  if (compiled_source_.get())
+    compiled_source_.reset();
 
 #ifdef HAS_DYNAMIC_LINKING
   dlclose(shared_library_);
diff --git a/tests/regression_tests/adj_cell_rotation/inputs_true.dat b/tests/regression_tests/adj_cell_rotation/inputs_true.dat
index 48774bb02..7e2a0cf62 100644
--- a/tests/regression_tests/adj_cell_rotation/inputs_true.dat
+++ b/tests/regression_tests/adj_cell_rotation/inputs_true.dat
@@ -29,7 +29,7 @@
     <particles>10000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
       </space>
diff --git a/tests/regression_tests/adj_cell_rotation/test.py b/tests/regression_tests/adj_cell_rotation/test.py
index 25aada5aa..9b867c18e 100644
--- a/tests/regression_tests/adj_cell_rotation/test.py
+++ b/tests/regression_tests/adj_cell_rotation/test.py
@@ -40,7 +40,7 @@ def model():
     model.settings.inactive = 5
     model.settings.batches = 10
     source_box = openmc.stats.Box((-4., -4., -4.), (4., 4., 4.))
-    model.settings.source = openmc.Source(space=source_box)
+    model.settings.source = openmc.IndependentSource(space=source_box)
 
     return model
 
diff --git a/tests/regression_tests/asymmetric_lattice/inputs_true.dat b/tests/regression_tests/asymmetric_lattice/inputs_true.dat
index 6a09b10a3..3977220da 100644
--- a/tests/regression_tests/asymmetric_lattice/inputs_true.dat
+++ b/tests/regression_tests/asymmetric_lattice/inputs_true.dat
@@ -208,7 +208,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-32 -32 0 32 32 32</parameters>
       </space>
diff --git a/tests/regression_tests/asymmetric_lattice/test.py b/tests/regression_tests/asymmetric_lattice/test.py
index 2197a1e7e..0d17a6c98 100644
--- a/tests/regression_tests/asymmetric_lattice/test.py
+++ b/tests/regression_tests/asymmetric_lattice/test.py
@@ -54,7 +54,7 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness):
         self._model.tallies.append(tally)
 
         # Specify summary output and correct source sampling box
-        self._model.settings.source = openmc.Source(space=openmc.stats.Box(
+        self._model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
             [-32, -32, 0], [32, 32, 32], only_fissionable = True))
 
     def _get_results(self, hash_output=True):
diff --git a/tests/regression_tests/create_fission_neutrons/inputs_true.dat b/tests/regression_tests/create_fission_neutrons/inputs_true.dat
index 8ee6f8b64..9e44a0224 100644
--- a/tests/regression_tests/create_fission_neutrons/inputs_true.dat
+++ b/tests/regression_tests/create_fission_neutrons/inputs_true.dat
@@ -20,7 +20,7 @@
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
diff --git a/tests/regression_tests/create_fission_neutrons/test.py b/tests/regression_tests/create_fission_neutrons/test.py
index 82bfaafa6..0ca4a48b2 100755
--- a/tests/regression_tests/create_fission_neutrons/test.py
+++ b/tests/regression_tests/create_fission_neutrons/test.py
@@ -38,8 +38,8 @@ class CreateFissionNeutronsTestHarness(PyAPITestHarness):
         bounds = [-1, -1, -1, 1, 1, 1]
         uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:])
         watt_dist = openmc.stats.Watt()
-        settings_file.source = openmc.source.Source(space=uniform_dist,
-                                                    energy=watt_dist)
+        settings_file.source = openmc.IndependentSource(space=uniform_dist,
+                                                        energy=watt_dist)
         self._model.settings = settings_file
 
         # Create tallies
diff --git a/tests/regression_tests/dagmc/external/inputs_true.dat b/tests/regression_tests/dagmc/external/inputs_true.dat
index 7237f4d46..31f4c1f88 100644
--- a/tests/regression_tests/dagmc/external/inputs_true.dat
+++ b/tests/regression_tests/dagmc/external/inputs_true.dat
@@ -20,7 +20,7 @@
     <particles>100</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/dagmc/external/test.py b/tests/regression_tests/dagmc/external/test.py
index 93123ae1e..7993772e8 100644
--- a/tests/regression_tests/dagmc/external/test.py
+++ b/tests/regression_tests/dagmc/external/test.py
@@ -65,7 +65,7 @@ def model():
     model.settings.particles = 100
     source_box = openmc.stats.Box([-4, -4, -4],
                                   [ 4,  4,  4])
-    source = openmc.Source(space=source_box)
+    source = openmc.IndependentSource(space=source_box)
     model.settings.source = source
     model.settings.temperature['default'] = 293
 
diff --git a/tests/regression_tests/dagmc/legacy/inputs_true.dat b/tests/regression_tests/dagmc/legacy/inputs_true.dat
index b6e5133a4..b06516cb1 100644
--- a/tests/regression_tests/dagmc/legacy/inputs_true.dat
+++ b/tests/regression_tests/dagmc/legacy/inputs_true.dat
@@ -20,7 +20,7 @@
     <particles>100</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/dagmc/legacy/test.py b/tests/regression_tests/dagmc/legacy/test.py
index 36da44808..7e4e6e134 100644
--- a/tests/regression_tests/dagmc/legacy/test.py
+++ b/tests/regression_tests/dagmc/legacy/test.py
@@ -22,7 +22,7 @@ def model():
 
     source_box = openmc.stats.Box([-4, -4, -4],
                                   [ 4,  4,  4])
-    source = openmc.Source(space=source_box)
+    source = openmc.IndependentSource(space=source_box)
 
     model.settings.source = source
 
diff --git a/tests/regression_tests/dagmc/refl/inputs_true.dat b/tests/regression_tests/dagmc/refl/inputs_true.dat
index 126702e38..979eeb492 100644
--- a/tests/regression_tests/dagmc/refl/inputs_true.dat
+++ b/tests/regression_tests/dagmc/refl/inputs_true.dat
@@ -10,7 +10,7 @@
     <particles>100</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/dagmc/refl/test.py b/tests/regression_tests/dagmc/refl/test.py
index 5b08f0c4a..03c1c407b 100644
--- a/tests/regression_tests/dagmc/refl/test.py
+++ b/tests/regression_tests/dagmc/refl/test.py
@@ -18,8 +18,8 @@ class UWUWTest(PyAPITestHarness):
         self._model.settings.inactive = 0
         self._model.settings.particles = 100
 
-        source = openmc.Source(space=Box([-4, -4, -4],
-                                         [ 4,  4,  4]))
+        source = openmc.IndependentSource(space=Box([-4, -4, -4],
+                                                    [ 4,  4,  4]))
         self._model.settings.source = source
 
         # geometry
diff --git a/tests/regression_tests/dagmc/uwuw/inputs_true.dat b/tests/regression_tests/dagmc/uwuw/inputs_true.dat
index e6537a30e..d7e4a12aa 100644
--- a/tests/regression_tests/dagmc/uwuw/inputs_true.dat
+++ b/tests/regression_tests/dagmc/uwuw/inputs_true.dat
@@ -10,7 +10,7 @@
     <particles>100</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/dagmc/uwuw/test.py b/tests/regression_tests/dagmc/uwuw/test.py
index 19986e589..38c335a5e 100644
--- a/tests/regression_tests/dagmc/uwuw/test.py
+++ b/tests/regression_tests/dagmc/uwuw/test.py
@@ -18,8 +18,8 @@ class UWUWTest(PyAPITestHarness):
         self._model.settings.inactive = 0
         self._model.settings.particles = 100
 
-        source = openmc.Source(space=Box([-4, -4, -4],
-                                         [ 4,  4,  4]))
+        source = openmc.IndependentSource(space=Box([-4, -4, -4],
+                                                    [ 4,  4,  4]))
         self._model.settings.source = source
 
         # geometry
diff --git a/tests/regression_tests/deplete_with_transport/test.py b/tests/regression_tests/deplete_with_transport/test.py
index 477959d1c..49e020367 100644
--- a/tests/regression_tests/deplete_with_transport/test.py
+++ b/tests/regression_tests/deplete_with_transport/test.py
@@ -46,7 +46,7 @@ def test_full(run_in_tmpdir, problem, multiproc):
     settings.batches = 10
     settings.inactive = 0
     space = openmc.stats.Box(lower_left, upper_right)
-    settings.source = openmc.Source(space=space)
+    settings.source = openmc.IndependentSource(space=space)
     settings.seed = 1
     settings.verbosity = 1
 
diff --git a/tests/regression_tests/diff_tally/inputs_true.dat b/tests/regression_tests/diff_tally/inputs_true.dat
index 5fad7175d..3ec4154e8 100644
--- a/tests/regression_tests/diff_tally/inputs_true.dat
+++ b/tests/regression_tests/diff_tally/inputs_true.dat
@@ -300,7 +300,7 @@
     <particles>100</particles>
     <batches>3</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-160 -160 -183 160 160 183</parameters>
       </space>
diff --git a/tests/regression_tests/diff_tally/test.py b/tests/regression_tests/diff_tally/test.py
index 18c501372..89460df91 100644
--- a/tests/regression_tests/diff_tally/test.py
+++ b/tests/regression_tests/diff_tally/test.py
@@ -16,7 +16,7 @@ class DiffTallyTestHarness(PyAPITestHarness):
         self._model.settings.batches = 3
         self._model.settings.inactive = 0
         self._model.settings.particles = 100
-        self._model.settings.source = openmc.Source(space=openmc.stats.Box(
+        self._model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
             [-160, -160, -183], [160, 160, 183]))
         self._model.settings.temperature['multipole'] = True
 
diff --git a/tests/regression_tests/distribmat/inputs_true.dat b/tests/regression_tests/distribmat/inputs_true.dat
index d002f0beb..ade86999d 100644
--- a/tests/regression_tests/distribmat/inputs_true.dat
+++ b/tests/regression_tests/distribmat/inputs_true.dat
@@ -40,7 +40,7 @@
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
diff --git a/tests/regression_tests/distribmat/test.py b/tests/regression_tests/distribmat/test.py
index ab7897313..02f7e773e 100644
--- a/tests/regression_tests/distribmat/test.py
+++ b/tests/regression_tests/distribmat/test.py
@@ -65,7 +65,7 @@ class DistribmatTestHarness(PyAPITestHarness):
         sets_file.batches = 5
         sets_file.inactive = 0
         sets_file.particles = 1000
-        sets_file.source = openmc.Source(space=openmc.stats.Box(
+        sets_file.source = openmc.IndependentSource(space=openmc.stats.Box(
             [-1, -1, -1], [1, 1, 1]))
         self._model.settings = sets_file
 
diff --git a/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
index 690cd14e3..a3e67d62f 100644
--- a/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
+++ b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
@@ -16,7 +16,7 @@
     <batches>7</batches>
     <inactive>3</inactive>
     <generations_per_batch>3</generations_per_batch>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
       </space>
diff --git a/tests/regression_tests/eigenvalue_genperbatch/test.py b/tests/regression_tests/eigenvalue_genperbatch/test.py
index 7e21c8d36..17c6dff7f 100644
--- a/tests/regression_tests/eigenvalue_genperbatch/test.py
+++ b/tests/regression_tests/eigenvalue_genperbatch/test.py
@@ -22,7 +22,7 @@ def model():
     model.settings.batches = 7
     model.settings.generations_per_batch = 3
     space = openmc.stats.Box((-4.0, -4.0, -4.0), (4.0, 4.0, 4.))
-    model.settings.source = openmc.Source(space=space)
+    model.settings.source = openmc.IndependentSource(space=space)
 
     t = openmc.Tally()
     t.scores = ['flux']
diff --git a/tests/regression_tests/energy_cutoff/inputs_true.dat b/tests/regression_tests/energy_cutoff/inputs_true.dat
index c24164dd8..af8f86b67 100644
--- a/tests/regression_tests/energy_cutoff/inputs_true.dat
+++ b/tests/regression_tests/energy_cutoff/inputs_true.dat
@@ -19,7 +19,7 @@
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
diff --git a/tests/regression_tests/energy_cutoff/test.py b/tests/regression_tests/energy_cutoff/test.py
index e05d17f5f..9aca802fa 100755
--- a/tests/regression_tests/energy_cutoff/test.py
+++ b/tests/regression_tests/energy_cutoff/test.py
@@ -40,8 +40,8 @@ class EnergyCutoffTestHarness(PyAPITestHarness):
         bounds = [-1, -1, -1, 1, 1, 1]
         uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:])
         watt_dist = openmc.stats.Watt()
-        settings_file.source = openmc.source.Source(space=uniform_dist,
-                                                    energy=watt_dist)
+        settings_file.source = openmc.IndependentSource(space=uniform_dist,
+                                                        energy=watt_dist)
         self._model.settings = settings_file
 
         # Tally flux under energy cutoff
diff --git a/tests/regression_tests/external_moab/inputs_true.dat b/tests/regression_tests/external_moab/inputs_true.dat
index d54f5db0e..23b656bce 100644
--- a/tests/regression_tests/external_moab/inputs_true.dat
+++ b/tests/regression_tests/external_moab/inputs_true.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/external_moab/test.py b/tests/regression_tests/external_moab/test.py
index 12e0e5425..90bff69ed 100644
--- a/tests/regression_tests/external_moab/test.py
+++ b/tests/regression_tests/external_moab/test.py
@@ -258,7 +258,7 @@ def test_external_mesh(cpp_driver):
     space = openmc.stats.Point()
     angle = openmc.stats.Monodirectional((-1.0, 0.0, 0.0))
     energy = openmc.stats.Discrete(x=[15.e+06], p=[1.0])
-    source = openmc.Source(space=space, energy=energy, angle=angle)
+    source = openmc.IndependentSource(space=space, energy=energy, angle=angle)
     settings.source = source
 
     model = openmc.model.Model(geometry=geometry,
diff --git a/tests/regression_tests/filter_cellinstance/inputs_true.dat b/tests/regression_tests/filter_cellinstance/inputs_true.dat
index d3e0937ec..b17cc0eb5 100644
--- a/tests/regression_tests/filter_cellinstance/inputs_true.dat
+++ b/tests/regression_tests/filter_cellinstance/inputs_true.dat
@@ -39,7 +39,7 @@
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/filter_cellinstance/test.py b/tests/regression_tests/filter_cellinstance/test.py
index 3f5fa54b2..0d6ad9366 100644
--- a/tests/regression_tests/filter_cellinstance/test.py
+++ b/tests/regression_tests/filter_cellinstance/test.py
@@ -69,7 +69,7 @@ def model():
     model.settings.batches = 5
     model.settings.inactive = 0
     model.settings.particles = 1000
-    model.settings.source = openmc.Source(space=openmc.stats.Point())
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point())
 
     instances = ([(c4, i) for i in range(c4.num_instances)] +
                  [(c2, i) for i in range(c2.num_instances)] +
diff --git a/tests/regression_tests/fixed_source/inputs_true.dat b/tests/regression_tests/fixed_source/inputs_true.dat
index 60043f20c..0fdb1466e 100644
--- a/tests/regression_tests/fixed_source/inputs_true.dat
+++ b/tests/regression_tests/fixed_source/inputs_true.dat
@@ -15,7 +15,7 @@
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>10</batches>
-    <source strength="10.0">
+    <source particle="neutron" strength="10.0" type="independent">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/fixed_source/test.py b/tests/regression_tests/fixed_source/test.py
index 74908f87c..b9ee25125 100644
--- a/tests/regression_tests/fixed_source/test.py
+++ b/tests/regression_tests/fixed_source/test.py
@@ -48,8 +48,8 @@ def test_fixed_source():
     model.settings.batches = 10
     model.settings.particles = 100
     model.settings.temperature = {'default': 294}
-    model.settings.source = openmc.Source(space=openmc.stats.Point(),
-                                          strength=10.0)
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point(),
+                                                     strength=10.0)
 
     tally = openmc.Tally()
     tally.scores = ['flux']
diff --git a/tests/regression_tests/iso_in_lab/inputs_true.dat b/tests/regression_tests/iso_in_lab/inputs_true.dat
index 2bb81da6d..bb6494ada 100644
--- a/tests/regression_tests/iso_in_lab/inputs_true.dat
+++ b/tests/regression_tests/iso_in_lab/inputs_true.dat
@@ -312,7 +312,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-160 -160 -183 160 160 183</parameters>
       </space>
diff --git a/tests/regression_tests/lattice_hex_coincident/inputs_true.dat b/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
index c51a38c89..7a83fb471 100644
--- a/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
+++ b/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
@@ -68,7 +68,7 @@
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>2</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-0.9899494936611666 -0.9899494936611666 0.0 0.9899494936611666 0.9899494936611666 10.0</parameters>
       </space>
diff --git a/tests/regression_tests/lattice_hex_coincident/test.py b/tests/regression_tests/lattice_hex_coincident/test.py
index fae7f939b..5a4760cd7 100644
--- a/tests/regression_tests/lattice_hex_coincident/test.py
+++ b/tests/regression_tests/lattice_hex_coincident/test.py
@@ -132,7 +132,7 @@ class HexLatticeCoincidentTestHarness(PyAPITestHarness):
         settings = openmc.Settings()
         settings.run_mode = 'eigenvalue'
 
-        source = openmc.Source()
+        source = openmc.IndependentSource()
         corner_dist = sqrt(2) * pin_rad
         ll = [-corner_dist, -corner_dist, 0.0]
         ur = [corner_dist, corner_dist, 10.0]
diff --git a/tests/regression_tests/lattice_hex_x/inputs_true.dat b/tests/regression_tests/lattice_hex_x/inputs_true.dat
index c51012029..2946258e8 100644
--- a/tests/regression_tests/lattice_hex_x/inputs_true.dat
+++ b/tests/regression_tests/lattice_hex_x/inputs_true.dat
@@ -113,7 +113,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-13.62546635287517 -13.62546635287517 0.0 13.62546635287517 13.62546635287517 10.0</parameters>
       </space>
diff --git a/tests/regression_tests/lattice_hex_x/test.py b/tests/regression_tests/lattice_hex_x/test.py
index e582c68ae..23aec77d3 100644
--- a/tests/regression_tests/lattice_hex_x/test.py
+++ b/tests/regression_tests/lattice_hex_x/test.py
@@ -187,7 +187,7 @@ class HexLatticeOXTestHarness(PyAPITestHarness):
         settings = openmc.Settings()
         settings.run_mode = 'eigenvalue'
 
-        source = openmc.Source()
+        source = openmc.IndependentSource()
         ll = [-edge_length, -edge_length, 0.0]
         ur = [edge_length, edge_length, 10.0]
         source.space = openmc.stats.Box(ll, ur)
diff --git a/tests/regression_tests/lattice_rotated/inputs_true.dat b/tests/regression_tests/lattice_rotated/inputs_true.dat
index 3a8a0784e..1b7c74870 100644
--- a/tests/regression_tests/lattice_rotated/inputs_true.dat
+++ b/tests/regression_tests/lattice_rotated/inputs_true.dat
@@ -62,7 +62,7 @@
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/lattice_rotated/test.py b/tests/regression_tests/lattice_rotated/test.py
index 9cab92e1e..63641fb84 100644
--- a/tests/regression_tests/lattice_rotated/test.py
+++ b/tests/regression_tests/lattice_rotated/test.py
@@ -73,7 +73,7 @@ def rotated_lattice_model():
     model.settings.batches = 5
     model.settings.inactive = 0
     model.settings.particles = 1000
-    model.settings.source = openmc.Source(space=openmc.stats.Point())
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point())
     model.settings.export_to_xml()
 
     return model
diff --git a/tests/regression_tests/mg_basic/inputs_true.dat b/tests/regression_tests/mg_basic/inputs_true.dat
index 5ec5ade75..8c6faaf07 100644
--- a/tests/regression_tests/mg_basic/inputs_true.dat
+++ b/tests/regression_tests/mg_basic/inputs_true.dat
@@ -48,7 +48,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 154.90833333333333 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_basic_delayed/inputs_true.dat b/tests/regression_tests/mg_basic_delayed/inputs_true.dat
index b3f1993d9..e0bcad15c 100644
--- a/tests/regression_tests/mg_basic_delayed/inputs_true.dat
+++ b/tests/regression_tests/mg_basic_delayed/inputs_true.dat
@@ -47,7 +47,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 154.90833333333333 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_convert/inputs_true.dat b/tests/regression_tests/mg_convert/inputs_true.dat
index 8277ca483..4e51ec80c 100644
--- a/tests/regression_tests/mg_convert/inputs_true.dat
+++ b/tests/regression_tests/mg_convert/inputs_true.dat
@@ -19,7 +19,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-5 -5 -5 5 5 5</parameters>
       </space>
diff --git a/tests/regression_tests/mg_convert/test.py b/tests/regression_tests/mg_convert/test.py
index d9c4a57bd..8099c89a2 100755
--- a/tests/regression_tests/mg_convert/test.py
+++ b/tests/regression_tests/mg_convert/test.py
@@ -114,7 +114,7 @@ class MGXSTestHarness(PyAPITestHarness):
         # Create an initial uniform spatial source distribution
         bounds = [-5, -5, -5, 5, 5, 5]
         uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:])
-        settings_file.source = openmc.source.Source(space=uniform_dist)
+        settings_file.source = openmc.IndependentSource(space=uniform_dist)
 
         self._model.settings = settings_file
 
diff --git a/tests/regression_tests/mg_legendre/inputs_true.dat b/tests/regression_tests/mg_legendre/inputs_true.dat
index 4b7293d81..34ff7b630 100644
--- a/tests/regression_tests/mg_legendre/inputs_true.dat
+++ b/tests/regression_tests/mg_legendre/inputs_true.dat
@@ -17,7 +17,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_max_order/inputs_true.dat b/tests/regression_tests/mg_max_order/inputs_true.dat
index 82699d00e..b6d70dc4c 100644
--- a/tests/regression_tests/mg_max_order/inputs_true.dat
+++ b/tests/regression_tests/mg_max_order/inputs_true.dat
@@ -17,7 +17,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_survival_biasing/inputs_true.dat b/tests/regression_tests/mg_survival_biasing/inputs_true.dat
index 2b5801e12..6529c60d8 100644
--- a/tests/regression_tests/mg_survival_biasing/inputs_true.dat
+++ b/tests/regression_tests/mg_survival_biasing/inputs_true.dat
@@ -17,7 +17,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_tallies/inputs_true.dat b/tests/regression_tests/mg_tallies/inputs_true.dat
index b7d362b17..c526b65a2 100644
--- a/tests/regression_tests/mg_tallies/inputs_true.dat
+++ b/tests/regression_tests/mg_tallies/inputs_true.dat
@@ -17,7 +17,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_temperature/build_2g.py b/tests/regression_tests/mg_temperature/build_2g.py
index 42f948be1..f236031a7 100644
--- a/tests/regression_tests/mg_temperature/build_2g.py
+++ b/tests/regression_tests/mg_temperature/build_2g.py
@@ -291,6 +291,6 @@ def build_inf_model(xsnames, xslibname, temperature, tempmethod='nearest'):
     bounds = [-INF, -INF, -INF, INF, INF, INF]
     uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:], only_fissionable=True)
     settings_file.temperature = {'method': tempmethod}
-    settings_file.source = openmc.Source(space=uniform_dist)
+    settings_file.source = openmc.IndependentSource(space=uniform_dist)
     model.settings = settings_file
     model.export_to_model_xml()
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
index 74067874a..d9a3c52c8 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
@@ -41,7 +41,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
index 13a6ea6d4..f84adc329 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
@@ -41,7 +41,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_condense/inputs_true.dat b/tests/regression_tests/mgxs_library_condense/inputs_true.dat
index ce7095765..93519cd2a 100644
--- a/tests/regression_tests/mgxs_library_condense/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_condense/inputs_true.dat
@@ -41,7 +41,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_correction/inputs_true.dat b/tests/regression_tests/mgxs_library_correction/inputs_true.dat
index 4d9dbecd6..80cbc4bb5 100644
--- a/tests/regression_tests/mgxs_library_correction/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_correction/inputs_true.dat
@@ -41,7 +41,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
index 893e0b3bf..fc2c06d1c 100644
--- a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
@@ -68,7 +68,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-10.71 -10.71 -1 10.71 10.71 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
index ce7095765..93519cd2a 100644
--- a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
@@ -41,7 +41,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_histogram/inputs_true.dat b/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
index f45b7dbf3..178a44464 100644
--- a/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
@@ -41,7 +41,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
index 0608d6f96..0003413ac 100644
--- a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
@@ -41,7 +41,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
index 215bb7c9f..97e227177 100644
--- a/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
@@ -41,7 +41,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat
index 907bf43cc..b73ed179e 100644
--- a/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat
@@ -41,7 +41,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat b/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
index 48774bb02..7e2a0cf62 100644
--- a/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
+++ b/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
@@ -29,7 +29,7 @@
     <particles>10000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
       </space>
diff --git a/tests/regression_tests/model_xml/photon_production_inputs_true.dat b/tests/regression_tests/model_xml/photon_production_inputs_true.dat
index 109b54c67..ee6cb8862 100644
--- a/tests/regression_tests/model_xml/photon_production_inputs_true.dat
+++ b/tests/regression_tests/model_xml/photon_production_inputs_true.dat
@@ -19,7 +19,7 @@
     <run_mode>fixed source</run_mode>
     <particles>10000</particles>
     <batches>1</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/multipole/inputs_true.dat b/tests/regression_tests/multipole/inputs_true.dat
index 5c905afb9..7bea66930 100644
--- a/tests/regression_tests/multipole/inputs_true.dat
+++ b/tests/regression_tests/multipole/inputs_true.dat
@@ -37,7 +37,7 @@
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
diff --git a/tests/regression_tests/multipole/test.py b/tests/regression_tests/multipole/test.py
index 4c4353c84..2f7369a9d 100644
--- a/tests/regression_tests/multipole/test.py
+++ b/tests/regression_tests/multipole/test.py
@@ -53,7 +53,7 @@ def make_model():
     model.settings.batches = 5
     model.settings.inactive = 0
     model.settings.particles = 1000
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         [-1, -1, -1], [1, 1, 1]))
     model.settings.temperature = {'tolerance': 1000, 'multipole': True}
 
diff --git a/tests/regression_tests/ncrystal/inputs_true.dat b/tests/regression_tests/ncrystal/inputs_true.dat
index be2336cf0..ecbc3c54f 100644
--- a/tests/regression_tests/ncrystal/inputs_true.dat
+++ b/tests/regression_tests/ncrystal/inputs_true.dat
@@ -16,7 +16,7 @@
     <run_mode>fixed source</run_mode>
     <particles>100000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0 0 -20</parameters>
       </space>
diff --git a/tests/regression_tests/ncrystal/test.py b/tests/regression_tests/ncrystal/test.py
index cb6421b03..03994e0d3 100644
--- a/tests/regression_tests/ncrystal/test.py
+++ b/tests/regression_tests/ncrystal/test.py
@@ -33,7 +33,7 @@ def pencil_beam_model(cfg, E0, N):
 
     # Source definition
 
-    source = openmc.Source()
+    source = openmc.IndependentSource()
     source.space = openmc.stats.Point((0, 0, -20))
     source.angle = openmc.stats.Monodirectional(reference_uvw=(0, 0, 1))
     source.energy = openmc.stats.Discrete([E0], [1.0])
diff --git a/tests/regression_tests/periodic/inputs_true.dat b/tests/regression_tests/periodic/inputs_true.dat
index 9d50c2b72..65e1b5ce3 100644
--- a/tests/regression_tests/periodic/inputs_true.dat
+++ b/tests/regression_tests/periodic/inputs_true.dat
@@ -28,7 +28,7 @@
     <particles>1000</particles>
     <batches>4</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>0 0 0 5 5 0</parameters>
       </space>
diff --git a/tests/regression_tests/periodic/test.py b/tests/regression_tests/periodic/test.py
index 51a70a6aa..73fe8a83e 100644
--- a/tests/regression_tests/periodic/test.py
+++ b/tests/regression_tests/periodic/test.py
@@ -42,7 +42,7 @@ def box_model():
     model.settings.particles = 1000
     model.settings.batches = 4
     model.settings.inactive = 0
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         (0, 0, 0), (5, 5, 0))
     )
     return model
diff --git a/tests/regression_tests/periodic_6fold/inputs_true.dat b/tests/regression_tests/periodic_6fold/inputs_true.dat
index 795ce818f..f7f413d09 100644
--- a/tests/regression_tests/periodic_6fold/inputs_true.dat
+++ b/tests/regression_tests/periodic_6fold/inputs_true.dat
@@ -25,7 +25,7 @@
     <particles>1000</particles>
     <batches>4</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>0 0 0 5 5 0</parameters>
       </space>
diff --git a/tests/regression_tests/periodic_6fold/test.py b/tests/regression_tests/periodic_6fold/test.py
index 69712eb5a..272c65df5 100644
--- a/tests/regression_tests/periodic_6fold/test.py
+++ b/tests/regression_tests/periodic_6fold/test.py
@@ -46,7 +46,7 @@ def model():
     model.settings.particles = 1000
     model.settings.batches = 4
     model.settings.inactive = 0
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         (0, 0, 0), (5, 5, 0))
     )
     return model
diff --git a/tests/regression_tests/photon_production/inputs_true.dat b/tests/regression_tests/photon_production/inputs_true.dat
index 109b54c67..ee6cb8862 100644
--- a/tests/regression_tests/photon_production/inputs_true.dat
+++ b/tests/regression_tests/photon_production/inputs_true.dat
@@ -19,7 +19,7 @@
     <run_mode>fixed source</run_mode>
     <particles>10000</particles>
     <batches>1</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/photon_production/test.py b/tests/regression_tests/photon_production/test.py
index 107b53bbb..150448a12 100644
--- a/tests/regression_tests/photon_production/test.py
+++ b/tests/regression_tests/photon_production/test.py
@@ -27,7 +27,7 @@ def model():
     inner_cyl_right.fill = mat
     model.geometry = openmc.Geometry([inner_cyl_left, inner_cyl_right, outer_cyl])
 
-    source = openmc.Source()
+    source = openmc.IndependentSource()
     source.space = openmc.stats.Point((0, 0, 0))
     source.angle = openmc.stats.Monodirectional()
     source.energy = openmc.stats.Discrete([14.0e6], [1.0])
diff --git a/tests/regression_tests/photon_production_fission/inputs_true.dat b/tests/regression_tests/photon_production_fission/inputs_true.dat
index 6a102cfdc..fa379b39e 100644
--- a/tests/regression_tests/photon_production_fission/inputs_true.dat
+++ b/tests/regression_tests/photon_production_fission/inputs_true.dat
@@ -15,7 +15,7 @@
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>2</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/photon_production_fission/test.py b/tests/regression_tests/photon_production_fission/test.py
index 595d3c2d6..96665b308 100644
--- a/tests/regression_tests/photon_production_fission/test.py
+++ b/tests/regression_tests/photon_production_fission/test.py
@@ -20,7 +20,7 @@ def model():
     model.settings.batches = 5
     model.settings.inactive = 2
     model.settings.photon_transport = True
-    model.settings.source = openmc.Source(space=openmc.stats.Point((0, 0, 0)))
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point((0, 0, 0)))
 
     particle_filter = openmc.ParticleFilter(['neutron', 'photon'])
     tally_tracklength = openmc.Tally()
diff --git a/tests/regression_tests/photon_source/inputs_true.dat b/tests/regression_tests/photon_source/inputs_true.dat
index 33ace2c70..3d2e05243 100644
--- a/tests/regression_tests/photon_source/inputs_true.dat
+++ b/tests/regression_tests/photon_source/inputs_true.dat
@@ -17,7 +17,7 @@
     <run_mode>fixed source</run_mode>
     <particles>10000</particles>
     <batches>1</batches>
-    <source particle="photon" strength="1.0">
+    <source particle="photon" strength="1.0" type="independent">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/photon_source/test.py b/tests/regression_tests/photon_source/test.py
index d4b4a69fd..c2eb1476d 100644
--- a/tests/regression_tests/photon_source/test.py
+++ b/tests/regression_tests/photon_source/test.py
@@ -21,7 +21,7 @@ class SourceTestHarness(PyAPITestHarness):
         inside_sphere.fill = mat
         self._model.geometry = openmc.Geometry([inside_sphere])
 
-        source = openmc.Source()
+        source = openmc.IndependentSource()
         source.space = openmc.stats.Point((0, 0, 0))
         source.angle = openmc.stats.Isotropic()
         source.energy = openmc.stats.Discrete([10.0e6], [1.0])
diff --git a/tests/regression_tests/resonance_scattering/inputs_true.dat b/tests/regression_tests/resonance_scattering/inputs_true.dat
index 6ab82ba24..dba4535c2 100644
--- a/tests/regression_tests/resonance_scattering/inputs_true.dat
+++ b/tests/regression_tests/resonance_scattering/inputs_true.dat
@@ -18,7 +18,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/resonance_scattering/test.py b/tests/regression_tests/resonance_scattering/test.py
index d9f76fac5..24629b12b 100644
--- a/tests/regression_tests/resonance_scattering/test.py
+++ b/tests/regression_tests/resonance_scattering/test.py
@@ -35,7 +35,7 @@ class ResonanceScatteringTestHarness(PyAPITestHarness):
         settings.batches = 10
         settings.inactive = 5
         settings.particles = 1000
-        settings.source = openmc.source.Source(
+        settings.source = openmc.IndependentSource(
              space=openmc.stats.Box([-4, -4, -4], [4, 4, 4]))
         settings.resonance_scattering = res_scat_settings
         self._model.settings = settings
diff --git a/tests/regression_tests/salphabeta/inputs_true.dat b/tests/regression_tests/salphabeta/inputs_true.dat
index 508624b75..ef0e843c2 100644
--- a/tests/regression_tests/salphabeta/inputs_true.dat
+++ b/tests/regression_tests/salphabeta/inputs_true.dat
@@ -51,7 +51,7 @@
     <particles>400</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/salphabeta/test.py b/tests/regression_tests/salphabeta/test.py
index fd0486118..11bf3bc84 100644
--- a/tests/regression_tests/salphabeta/test.py
+++ b/tests/regression_tests/salphabeta/test.py
@@ -67,7 +67,7 @@ def make_model():
     model.settings.batches = 5
     model.settings.inactive = 0
     model.settings.particles = 400
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         [-4, -4, -4], [4, 4, 4]))
 
     return model
diff --git a/tests/regression_tests/source/inputs_true.dat b/tests/regression_tests/source/inputs_true.dat
index 460be7077..c1a616dd1 100644
--- a/tests/regression_tests/source/inputs_true.dat
+++ b/tests/regression_tests/source/inputs_true.dat
@@ -15,7 +15,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="0.3">
+    <source particle="neutron" strength="0.3" type="independent">
       <space type="cartesian">
         <x parameters="-3.0 3.0" type="uniform"/>
         <y type="discrete">
@@ -33,14 +33,14 @@
       </angle>
       <energy parameters="1289500.0" type="maxwell"/>
     </source>
-    <source strength="0.1">
+    <source particle="neutron" strength="0.1" type="independent">
       <space type="box">
         <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
       </space>
       <angle reference_uvw="0.0 1.0 0.0" type="monodirectional"/>
       <energy parameters="988000.0 2.249e-06" type="watt"/>
     </source>
-    <source strength="0.1">
+    <source particle="neutron" strength="0.1" type="independent">
       <space type="point">
         <parameters>1.2 -2.3 0.781</parameters>
       </space>
@@ -49,7 +49,7 @@
         <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
       </energy>
     </source>
-    <source strength="0.1">
+    <source particle="neutron" strength="0.1" type="independent">
       <space origin="1.0 1.0 0.0" type="spherical">
         <r parameters="2.0 3.0" type="uniform"/>
         <cos_theta type="discrete">
@@ -62,7 +62,7 @@
         <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
       </energy>
     </source>
-    <source strength="0.1">
+    <source particle="neutron" strength="0.1" type="independent">
       <space origin="1.0 1.0 0.0" type="cylindrical">
         <r parameters="2.0 3.0" type="uniform"/>
         <phi parameters="0.0 6.283185307179586" type="uniform"/>
@@ -75,7 +75,7 @@
         <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
       </energy>
     </source>
-    <source strength="0.1">
+    <source particle="neutron" strength="0.1" type="independent">
       <space origin="1.0 1.0 0.0" type="cylindrical">
         <r parameters="2.0 3.0" type="uniform"/>
         <phi parameters="0.0 6.283185307179586" type="uniform"/>
@@ -98,7 +98,7 @@
         </pair>
       </energy>
     </source>
-    <source strength="0.1">
+    <source particle="neutron" strength="0.1" type="independent">
       <space origin="1.0 1.0 0.0" type="spherical">
         <r parameters="2.0 3.0 2.0" type="powerlaw"/>
         <cos_theta type="discrete">
@@ -122,7 +122,7 @@
       </energy>
       <time parameters="2 5" type="uniform"/>
     </source>
-    <source strength="0.1">
+    <source particle="neutron" strength="0.1" type="independent">
       <space origin="1.0 1.0 0.0" type="cylindrical">
         <r parameters="2.0 3.0 1.0" type="powerlaw"/>
         <phi parameters="0.0 6.283185307179586" type="uniform"/>
diff --git a/tests/regression_tests/source/test.py b/tests/regression_tests/source/test.py
index af9e67baa..c1f4dccff 100644
--- a/tests/regression_tests/source/test.py
+++ b/tests/regression_tests/source/test.py
@@ -68,14 +68,14 @@ class SourceTestHarness(PyAPITestHarness):
 
         time1 = openmc.stats.Uniform(2, 5)
 
-        source1 = openmc.Source(spatial1, angle1, energy1, strength=0.3)
-        source2 = openmc.Source(spatial2, angle2, energy2, strength=0.1)
-        source3 = openmc.Source(spatial3, angle3, energy3, strength=0.1)
-        source4 = openmc.Source(spatial4, angle3, energy3, strength=0.1)
-        source5 = openmc.Source(spatial5, angle3, energy3, strength=0.1)
-        source6 = openmc.Source(spatial5, angle3, energy4, strength=0.1)
-        source7 = openmc.Source(spatial6, angle3, energy4, time1, strength=0.1)
-        source8 = openmc.Source(spatial7, angle3, energy4, time1, strength=0.1)
+        source1 = openmc.IndependentSource(spatial1, angle1, energy1, strength=0.3)
+        source2 = openmc.IndependentSource(spatial2, angle2, energy2, strength=0.1)
+        source3 = openmc.IndependentSource(spatial3, angle3, energy3, strength=0.1)
+        source4 = openmc.IndependentSource(spatial4, angle3, energy3, strength=0.1)
+        source5 = openmc.IndependentSource(spatial5, angle3, energy3, strength=0.1)
+        source6 = openmc.IndependentSource(spatial5, angle3, energy4, strength=0.1)
+        source7 = openmc.IndependentSource(spatial6, angle3, energy4, time1, strength=0.1)
+        source8 = openmc.IndependentSource(spatial7, angle3, energy4, time1, strength=0.1)
 
         settings = openmc.Settings()
         settings.batches = 10
diff --git a/tests/regression_tests/source_dlopen/inputs_true.dat b/tests/regression_tests/source_dlopen/inputs_true.dat
index 9d97164ad..28d1e06e2 100644
--- a/tests/regression_tests/source_dlopen/inputs_true.dat
+++ b/tests/regression_tests/source_dlopen/inputs_true.dat
@@ -18,6 +18,18 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>0</inactive>
-    <source library="build/libsource.so" strength="1.0"/>
+    <source library="build/libsource.so" strength="1.0" type="compiled"/>
   </settings>
-  </model>
+  <tallies>
+    <filter id="1" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 2000.0 1000000.0</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/source_dlopen/results_true.dat b/tests/regression_tests/source_dlopen/results_true.dat
index e69de29bb..1cddaf802 100644
--- a/tests/regression_tests/source_dlopen/results_true.dat
+++ b/tests/regression_tests/source_dlopen/results_true.dat
@@ -0,0 +1,5 @@
+tally 1:
+1.445856E+04
+2.090732E+07
+0.000000E+00
+0.000000E+00
diff --git a/tests/regression_tests/source_dlopen/source_sampling.cpp b/tests/regression_tests/source_dlopen/source_sampling.cpp
index 2c6de6d85..fc61ef1fd 100644
--- a/tests/regression_tests/source_dlopen/source_sampling.cpp
+++ b/tests/regression_tests/source_dlopen/source_sampling.cpp
@@ -5,8 +5,7 @@
 #include "openmc/random_lcg.h"
 #include "openmc/source.h"
 
-class CustomSource : public openmc::Source
-{
+class CustomSource : public openmc::Source {
   openmc::SourceSite sample(uint64_t* seed) const
   {
     openmc::SourceSite particle;
@@ -20,16 +19,17 @@ class CustomSource : public openmc::Source
     particle.r.z = 0.;
     // angle
     particle.u = {1.0, 0.0, 0.0};
-    particle.E = 14.08e6;
+    particle.E = 1.00e3;
     particle.delayed_group = 0;
     return particle;
   }
 };
 
-// A function to create a unique pointer to an instance of this class when generated
-// via a plugin call using dlopen/dlsym.
-// You must have external C linkage here otherwise dlopen will not find the file
-extern "C" std::unique_ptr<CustomSource> openmc_create_source(std::string parameters)
+// A function to create a unique pointer to an instance of this class when
+// generated via a plugin call using dlopen/dlsym. You must have external C
+// linkage here otherwise dlopen will not find the file
+extern "C" std::unique_ptr<CustomSource> openmc_create_source(
+  std::string parameters)
 {
   return std::make_unique<CustomSource>();
 }
diff --git a/tests/regression_tests/source_dlopen/test.py b/tests/regression_tests/source_dlopen/test.py
index 41690224d..efe942933 100644
--- a/tests/regression_tests/source_dlopen/test.py
+++ b/tests/regression_tests/source_dlopen/test.py
@@ -61,8 +61,18 @@ def model():
     model.settings.particles = 1000
     model.settings.run_mode = 'fixed source'
 
+    tally = openmc.Tally()
+    mat_filter = openmc.MaterialFilter([natural_lead])
+    # energy filter with two bins 0 eV - 1 keV and 1 keV - 1 MeV the second bin
+    # of the energy filter (last two entries in the tally results) should be
+    # zero
+    energy_filter = openmc.EnergyFilter([0.0, 2e3, 1e6])
+    tally.filters = [mat_filter, energy_filter]
+    tally.scores = ['flux']
+    model.tallies = openmc.Tallies([tally])
+
     # custom source from shared library
-    source = openmc.Source()
+    source = openmc.CompiledSource()
     source.library = 'build/libsource.so'
     model.settings.source = source
 
diff --git a/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat b/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
index 689463593..6cf3473f9 100644
--- a/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
+++ b/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
@@ -18,6 +18,18 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>0</inactive>
-    <source library="build/libsource.so" parameters="1e3" strength="1.0"/>
+    <source library="build/libsource.so" parameters="1e3" strength="1.0" type="compiled"/>
   </settings>
-  </model>
+  <tallies>
+    <filter id="1" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="energy">
+      <bins>0.0 2000.0 1000000.0</bins>
+    </filter>
+    <tally id="1">
+      <filters>1 2</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/source_parameterized_dlopen/results_true.dat b/tests/regression_tests/source_parameterized_dlopen/results_true.dat
index e69de29bb..1cddaf802 100644
--- a/tests/regression_tests/source_parameterized_dlopen/results_true.dat
+++ b/tests/regression_tests/source_parameterized_dlopen/results_true.dat
@@ -0,0 +1,5 @@
+tally 1:
+1.445856E+04
+2.090732E+07
+0.000000E+00
+0.000000E+00
diff --git a/tests/regression_tests/source_parameterized_dlopen/test.py b/tests/regression_tests/source_parameterized_dlopen/test.py
index c613cde4b..c7c5d06b1 100644
--- a/tests/regression_tests/source_parameterized_dlopen/test.py
+++ b/tests/regression_tests/source_parameterized_dlopen/test.py
@@ -61,8 +61,17 @@ def model():
     model.settings.particles = 1000
     model.settings.run_mode = 'fixed source'
 
+    tally = openmc.Tally()
+    mat_filter = openmc.MaterialFilter([natural_lead])
+    # energy filter with two bins 0 eV - 1 keV and 1 keV - 1 MeV
+    # the second bin shouldn't have any results
+    energy_filter = openmc.EnergyFilter([0.0, 2e3, 1e6])
+    tally.filters = [mat_filter, energy_filter]
+    tally.scores = ['flux']
+    model.tallies = openmc.Tallies([tally])
+
     # custom source from shared library
-    source = openmc.Source()
+    source = openmc.CompiledSource()
     source.library = 'build/libsource.so'
     source.parameters = '1e3'
     model.settings.source = source
diff --git a/tests/regression_tests/surface_source/inputs_true_write.dat b/tests/regression_tests/surface_source/inputs_true_write.dat
index 4747fcaf4..5c85de631 100644
--- a/tests/regression_tests/surface_source/inputs_true_write.dat
+++ b/tests/regression_tests/surface_source/inputs_true_write.dat
@@ -16,7 +16,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source/test.py b/tests/regression_tests/surface_source/test.py
index dc60cfd3c..1647266f6 100644
--- a/tests/regression_tests/surface_source/test.py
+++ b/tests/regression_tests/surface_source/test.py
@@ -44,7 +44,7 @@ def model(request):
 
     if surf_source_op == 'write':
         point = openmc.stats.Point((0, 0, 0))
-        pt_src = openmc.Source(space=point)
+        pt_src = openmc.IndependentSource(space=point)
         openmc_model.settings.source = pt_src
 
         openmc_model.settings.surf_source_write = {'surface_ids': [1],
diff --git a/tests/regression_tests/surface_tally/inputs_true.dat b/tests/regression_tests/surface_tally/inputs_true.dat
index 4be5d4e77..dc65e2a15 100644
--- a/tests/regression_tests/surface_tally/inputs_true.dat
+++ b/tests/regression_tests/surface_tally/inputs_true.dat
@@ -29,7 +29,7 @@
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="fission">
         <parameters>-0.62992 -0.62992 -1 0.62992 0.62992 1</parameters>
       </space>
diff --git a/tests/regression_tests/surface_tally/test.py b/tests/regression_tests/surface_tally/test.py
index 001fe6448..1224ebbb9 100644
--- a/tests/regression_tests/surface_tally/test.py
+++ b/tests/regression_tests/surface_tally/test.py
@@ -74,7 +74,7 @@ class SurfaceTallyTestHarness(PyAPITestHarness):
         bounds = [-0.62992, -0.62992, -1, 0.62992, 0.62992, 1]
         uniform_dist = openmc.stats.Box(bounds[:3], bounds[3:],\
              only_fissionable=True)
-        settings_file.source = openmc.source.Source(space=uniform_dist)
+        settings_file.source = openmc.IndependentSource(space=uniform_dist)
         self._model.settings = settings_file
 
         # Tallies file
diff --git a/tests/regression_tests/tallies/inputs_true.dat b/tests/regression_tests/tallies/inputs_true.dat
index 8d2e50af8..2ce36c5df 100644
--- a/tests/regression_tests/tallies/inputs_true.dat
+++ b/tests/regression_tests/tallies/inputs_true.dat
@@ -300,7 +300,7 @@
     <particles>400</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-160 -160 -183 160 160 183</parameters>
       </space>
diff --git a/tests/regression_tests/tallies/test.py b/tests/regression_tests/tallies/test.py
index 6b4baabce..d20067ed3 100644
--- a/tests/regression_tests/tallies/test.py
+++ b/tests/regression_tests/tallies/test.py
@@ -13,7 +13,7 @@ def test_tallies():
     model.settings.batches = 5
     model.settings.inactive = 0
     model.settings.particles = 400
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         [-160, -160, -183], [160, 160, 183]))
 
     azimuthal_bins = (-3.14159, -1.8850, -0.6283, 0.6283, 1.8850, 3.14159)
diff --git a/tests/regression_tests/tally_slice_merge/inputs_true.dat b/tests/regression_tests/tally_slice_merge/inputs_true.dat
index 5dff76a68..356962f8e 100644
--- a/tests/regression_tests/tally_slice_merge/inputs_true.dat
+++ b/tests/regression_tests/tally_slice_merge/inputs_true.dat
@@ -300,7 +300,7 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="box">
         <parameters>-160 -160 -183 160 160 183</parameters>
       </space>
diff --git a/tests/regression_tests/torus/large_major/inputs_true.dat b/tests/regression_tests/torus/large_major/inputs_true.dat
index 44a67b8aa..fa7deb29a 100644
--- a/tests/regression_tests/torus/large_major/inputs_true.dat
+++ b/tests/regression_tests/torus/large_major/inputs_true.dat
@@ -22,7 +22,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>-1000.0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/torus/large_major/test.py b/tests/regression_tests/torus/large_major/test.py
index 256716f4e..1ce1ab2ca 100644
--- a/tests/regression_tests/torus/large_major/test.py
+++ b/tests/regression_tests/torus/large_major/test.py
@@ -28,7 +28,7 @@ def model():
     model.settings.run_mode ='fixed source'
     model.settings.particles = 1000
     model.settings.batches = 10
-    model.settings.source = openmc.Source(space=openmc.stats.Point((-R, 0, 0,)))
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point((-R, 0, 0,)))
 
     tally = openmc.Tally()
     tally.scores = ['flux']
diff --git a/tests/regression_tests/triso/inputs_true.dat b/tests/regression_tests/triso/inputs_true.dat
index 606f05f14..37f37af78 100644
--- a/tests/regression_tests/triso/inputs_true.dat
+++ b/tests/regression_tests/triso/inputs_true.dat
@@ -433,7 +433,7 @@
     <particles>100</particles>
     <batches>4</batches>
     <inactive>0</inactive>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/triso/test.py b/tests/regression_tests/triso/test.py
index 06ae04492..3fa5e3c60 100644
--- a/tests/regression_tests/triso/test.py
+++ b/tests/regression_tests/triso/test.py
@@ -81,7 +81,7 @@ class TRISOTestHarness(PyAPITestHarness):
         settings.batches = 4
         settings.inactive = 0
         settings.particles = 100
-        settings.source = openmc.Source(space=openmc.stats.Point())
+        settings.source = openmc.IndependentSource(space=openmc.stats.Point())
         self._model.settings = settings
 
         self._model.materials = openmc.Materials([fuel, porous_carbon, ipyc,
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true.dat b/tests/regression_tests/unstructured_mesh/inputs_true.dat
index 55fdf825b..07486d3e0 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true0.dat b/tests/regression_tests/unstructured_mesh/inputs_true0.dat
index 45e15c597..c6b28d890 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true0.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true0.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true1.dat b/tests/regression_tests/unstructured_mesh/inputs_true1.dat
index d47985ceb..40183c89b 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true1.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true1.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true10.dat b/tests/regression_tests/unstructured_mesh/inputs_true10.dat
index 943ef2dc8..ebc5548f5 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true10.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true10.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true11.dat b/tests/regression_tests/unstructured_mesh/inputs_true11.dat
index d0888b4b8..e30a5ccfc 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true11.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true11.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true12.dat b/tests/regression_tests/unstructured_mesh/inputs_true12.dat
index b431b412e..a60b70eab 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true12.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true12.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true13.dat b/tests/regression_tests/unstructured_mesh/inputs_true13.dat
index f53e733a8..1b1aa19c3 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true13.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true13.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true14.dat b/tests/regression_tests/unstructured_mesh/inputs_true14.dat
index 05bdf3ae9..d07504b9d 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true14.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true14.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true15.dat b/tests/regression_tests/unstructured_mesh/inputs_true15.dat
index 67c8af427..8cabbb38d 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true15.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true15.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true2.dat b/tests/regression_tests/unstructured_mesh/inputs_true2.dat
index 78ff40199..3521ac7b8 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true2.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true2.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true3.dat b/tests/regression_tests/unstructured_mesh/inputs_true3.dat
index fe5515493..a376b401d 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true3.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true3.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true8.dat b/tests/regression_tests/unstructured_mesh/inputs_true8.dat
index 1e3b6cb83..5f14aa691 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true8.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true8.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true9.dat b/tests/regression_tests/unstructured_mesh/inputs_true9.dat
index cb35eb186..92354c75c 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true9.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true9.dat
@@ -46,7 +46,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space origin="0.0 0.0 0.0" type="spherical">
         <r parameters="0.0 0.0" type="uniform"/>
         <cos_theta type="discrete">
diff --git a/tests/regression_tests/unstructured_mesh/results_true.dat b/tests/regression_tests/unstructured_mesh/results_true.dat
deleted file mode 100644
index a6cad647c..000000000
--- a/tests/regression_tests/unstructured_mesh/results_true.dat
+++ /dev/null
@@ -1,4002 +0,0 @@
-tally 1:
-2.084815E-02
-1.082750E-04
-6.381818E-02
-9.439513E-04
-1.155641E-01
-2.178751E-03
-6.865908E-02
-7.355866E-04
-6.720820E-02
-7.310529E-04
-9.537792E-02
-1.957273E-03
-1.007744E-01
-1.573169E-03
-9.409645E-02
-1.796197E-03
-7.113698E-02
-8.980335E-04
-2.405019E-02
-9.740436E-05
-6.040159E-02
-7.575405E-04
-1.050048E-01
-2.108780E-03
-1.307457E-01
-2.170448E-03
-9.988454E-02
-1.092936E-03
-1.547083E-01
-3.688477E-03
-8.157999E-02
-1.133034E-03
-1.368232E-01
-2.667957E-03
-1.444186E-01
-3.197937E-03
-1.049316E-01
-1.560309E-03
-7.358073E-02
-1.128410E-03
-4.923095E-02
-6.563588E-04
-9.650255E-02
-1.789194E-03
-1.467738E-01
-3.481509E-03
-1.687123E-01
-5.414669E-03
-1.873036E-01
-4.734353E-03
-1.130087E-01
-1.673004E-03
-1.695614E-01
-3.526426E-03
-2.591168E-01
-8.231726E-03
-1.260152E-01
-2.175978E-03
-6.288783E-02
-9.200482E-04
-8.362502E-02
-1.022521E-03
-1.456806E-01
-3.692821E-03
-1.468696E-01
-3.582954E-03
-1.848215E-01
-5.256814E-03
-2.212472E-01
-5.760540E-03
-2.169211E-01
-5.946348E-03
-1.919182E-01
-7.063068E-03
-1.588234E-01
-3.825511E-03
-1.149909E-01
-1.553531E-03
-8.539019E-02
-1.065672E-03
-1.458566E-01
-4.113559E-03
-2.049774E-01
-6.265197E-03
-2.166930E-01
-7.983860E-03
-1.757110E-01
-5.024516E-03
-2.353728E-01
-7.533032E-03
-1.280409E-01
-2.167446E-03
-1.648011E-01
-3.936025E-03
-1.599354E-01
-3.980976E-03
-1.679361E-01
-3.415565E-03
-6.849881E-02
-7.535621E-04
-8.785791E-02
-1.103156E-03
-1.709025E-01
-4.264016E-03
-1.929437E-01
-4.281538E-03
-1.711011E-01
-3.912611E-03
-1.562002E-01
-3.325900E-03
-2.153821E-01
-5.848786E-03
-1.610373E-01
-3.861192E-03
-2.389629E-01
-8.850896E-03
-1.539258E-01
-3.811869E-03
-7.844092E-02
-1.163579E-03
-2.298462E-02
-1.395953E-04
-1.570027E-01
-4.835079E-03
-1.123717E-01
-1.760314E-03
-1.821249E-01
-6.802302E-03
-2.461041E-01
-7.613043E-03
-1.904001E-01
-4.047242E-03
-2.024477E-01
-5.524067E-03
-1.167011E-01
-2.057180E-03
-8.780067E-02
-1.080238E-03
-5.397296E-02
-5.850746E-04
-5.037871E-02
-5.560040E-04
-8.289459E-02
-1.268000E-03
-1.469691E-01
-4.146173E-03
-1.075211E-01
-1.625602E-03
-2.187908E-01
-6.919967E-03
-1.278025E-01
-2.170886E-03
-9.950167E-02
-1.901085E-03
-1.104557E-01
-2.248074E-03
-1.262151E-01
-2.266348E-03
-5.580544E-02
-9.620095E-04
-5.104294E-02
-5.268938E-04
-9.139465E-02
-1.164619E-03
-7.378130E-02
-1.282188E-03
-8.021098E-02
-7.940912E-04
-1.290978E-01
-2.526036E-03
-9.365705E-02
-1.199392E-03
-6.078377E-02
-5.442247E-04
-7.556566E-02
-8.976997E-04
-6.453527E-02
-1.173497E-03
-4.302808E-02
-5.599709E-04
-3.878239E-02
-5.236943E-04
-6.099196E-02
-1.095513E-03
-9.150086E-02
-1.624380E-03
-5.728387E-02
-5.659010E-04
-9.405318E-02
-1.606034E-03
-8.619696E-02
-1.337493E-03
-1.055978E-01
-2.086153E-03
-8.890472E-02
-1.315673E-03
-6.441028E-02
-7.477974E-04
-6.069918E-02
-6.588335E-04
-1.095224E-01
-2.675022E-03
-1.096306E-01
-2.122353E-03
-1.342330E-01
-3.619967E-03
-1.114064E-01
-1.730639E-03
-1.074251E-01
-1.586218E-03
-1.408447E-01
-2.389426E-03
-1.301662E-01
-3.969782E-03
-7.949674E-02
-1.090923E-03
-1.074998E-01
-3.217694E-03
-3.528248E-02
-2.289672E-04
-9.882155E-02
-1.696404E-03
-1.354820E-01
-2.909227E-03
-1.599751E-01
-2.957031E-03
-2.280781E-01
-6.081628E-03
-2.100930E-01
-5.450110E-03
-2.732779E-01
-8.620164E-03
-1.993743E-01
-5.362856E-03
-2.198036E-01
-5.376103E-03
-1.502824E-01
-2.786908E-03
-4.996523E-02
-5.024077E-04
-1.680575E-01
-3.208887E-03
-1.422788E-01
-4.002215E-03
-1.762382E-01
-4.255455E-03
-2.502725E-01
-7.152209E-03
-3.414429E-01
-1.411003E-02
-2.636737E-01
-9.397976E-03
-2.247647E-01
-7.123896E-03
-3.224482E-01
-1.294508E-02
-1.622669E-01
-3.583977E-03
-1.248655E-01
-2.516158E-03
-6.877708E-02
-1.029829E-03
-1.976808E-01
-6.130857E-03
-3.144113E-01
-1.232063E-02
-3.018257E-01
-1.124658E-02
-2.619717E-01
-8.351589E-03
-3.672028E-01
-1.638863E-02
-3.059552E-01
-1.103037E-02
-2.486122E-01
-8.141595E-03
-1.750139E-01
-3.956566E-03
-1.436264E-01
-3.567607E-03
-1.239696E-01
-2.379611E-03
-2.163287E-01
-5.949023E-03
-2.072743E-01
-5.179000E-03
-3.646146E-01
-1.695667E-02
-3.486264E-01
-1.301568E-02
-3.563685E-01
-1.447225E-02
-2.970379E-01
-1.009480E-02
-2.762591E-01
-9.482575E-03
-2.499264E-01
-7.462884E-03
-6.344775E-02
-6.567949E-04
-1.086029E-01
-1.976496E-03
-2.603220E-01
-8.391117E-03
-2.841149E-01
-1.105366E-02
-3.965469E-01
-1.974149E-02
-3.901607E-01
-1.960621E-02
-3.509285E-01
-1.478774E-02
-2.714593E-01
-8.321432E-03
-2.293816E-01
-7.685918E-03
-1.265740E-01
-2.312172E-03
-1.103539E-01
-2.077575E-03
-1.262352E-01
-2.754572E-03
-2.213458E-01
-6.719185E-03
-3.023706E-01
-1.146381E-02
-3.282506E-01
-1.233694E-02
-2.853774E-01
-1.070129E-02
-2.848374E-01
-9.701790E-03
-3.176142E-01
-1.194832E-02
-2.880766E-01
-1.175767E-02
-1.572435E-01
-3.553858E-03
-1.501104E-01
-2.820093E-03
-1.273408E-01
-2.552547E-03
-1.499070E-01
-3.571856E-03
-2.199953E-01
-7.783541E-03
-2.453178E-01
-7.052370E-03
-2.643229E-01
-9.900690E-03
-2.574947E-01
-8.333501E-03
-2.455689E-01
-8.366273E-03
-1.782866E-01
-3.900659E-03
-1.384975E-01
-2.258716E-03
-8.944673E-02
-1.404954E-03
-5.659795E-02
-4.694852E-04
-9.581840E-02
-1.386427E-03
-2.009835E-01
-6.159157E-03
-1.897439E-01
-7.235399E-03
-1.830639E-01
-5.540521E-03
-1.520639E-01
-2.752778E-03
-2.084599E-01
-5.955188E-03
-1.319666E-01
-2.817088E-03
-1.693010E-01
-3.303866E-03
-7.800745E-02
-8.928402E-04
-4.749930E-02
-5.129237E-04
-6.919528E-02
-9.104379E-04
-1.119151E-01
-2.477462E-03
-1.102521E-01
-1.584592E-03
-1.564084E-01
-3.266574E-03
-1.198104E-01
-2.580046E-03
-1.828790E-01
-4.860390E-03
-7.542042E-02
-1.053718E-03
-1.099096E-01
-1.964225E-03
-6.193848E-02
-6.865448E-04
-5.105046E-02
-5.591936E-04
-5.609383E-02
-5.921134E-04
-9.705482E-02
-1.351531E-03
-1.601898E-01
-3.408525E-03
-1.711068E-01
-3.795257E-03
-2.205615E-01
-7.391402E-03
-1.668188E-01
-3.216331E-03
-1.359445E-01
-2.208925E-03
-9.194982E-02
-1.221828E-03
-3.090110E-02
-1.871704E-04
-1.137084E-01
-1.891251E-03
-1.350332E-01
-3.254232E-03
-1.906275E-01
-4.961645E-03
-2.657405E-01
-8.636878E-03
-3.845292E-01
-1.700936E-02
-2.839796E-01
-9.879629E-03
-2.593192E-01
-7.387676E-03
-1.606576E-01
-4.742954E-03
-1.870343E-01
-4.582302E-03
-8.524427E-02
-1.055424E-03
-1.918440E-01
-4.887813E-03
-2.109751E-01
-5.543123E-03
-2.472924E-01
-8.124732E-03
-4.210681E-01
-1.934743E-02
-3.735043E-01
-1.670088E-02
-4.705633E-01
-2.767424E-02
-4.105274E-01
-2.102523E-02
-4.139000E-01
-1.844845E-02
-2.302657E-01
-6.040845E-03
-1.013844E-01
-1.496233E-03
-1.060074E-01
-1.569679E-03
-3.421581E-01
-1.371034E-02
-4.542071E-01
-2.517473E-02
-5.784381E-01
-3.768770E-02
-4.172596E-01
-1.856012E-02
-5.299200E-01
-3.825470E-02
-5.178634E-01
-3.589903E-02
-4.185970E-01
-1.861497E-02
-2.546343E-01
-8.375242E-03
-1.304944E-01
-1.999316E-03
-1.290019E-01
-2.856345E-03
-2.844146E-01
-9.114045E-03
-4.560916E-01
-2.713184E-02
-7.260552E-01
-5.922762E-02
-7.310584E-01
-6.237152E-02
-6.478348E-01
-5.416126E-02
-4.846913E-01
-3.277993E-02
-4.849197E-01
-2.856176E-02
-2.465437E-01
-7.303148E-03
-1.744812E-01
-4.301498E-03
-1.796564E-01
-4.684076E-03
-2.812314E-01
-1.216852E-02
-4.240103E-01
-2.176819E-02
-5.209518E-01
-3.000472E-02
-6.504938E-01
-4.819256E-02
-5.990305E-01
-4.159076E-02
-5.121545E-01
-3.102991E-02
-3.470484E-01
-1.737934E-02
-2.216267E-01
-5.579967E-03
-1.708599E-01
-4.101306E-03
-1.374646E-01
-2.373831E-03
-2.399512E-01
-9.436021E-03
-4.641786E-01
-2.746647E-02
-4.258629E-01
-2.112979E-02
-6.864289E-01
-5.425243E-02
-6.579119E-01
-5.051533E-02
-4.223368E-01
-2.321407E-02
-4.058385E-01
-2.310793E-02
-2.072746E-01
-5.809548E-03
-2.339589E-01
-7.282388E-03
-9.714578E-02
-1.698684E-03
-1.688968E-01
-3.770170E-03
-2.795405E-01
-9.154147E-03
-3.109678E-01
-1.173563E-02
-3.911757E-01
-1.773775E-02
-4.374549E-01
-2.366240E-02
-4.611865E-01
-2.432741E-02
-2.516503E-01
-7.415388E-03
-1.292894E-01
-2.441647E-03
-2.226852E-01
-6.770128E-03
-8.639730E-02
-1.201841E-03
-1.449879E-01
-2.972972E-03
-1.801392E-01
-3.863618E-03
-1.936577E-01
-4.483865E-03
-2.453357E-01
-9.056291E-03
-2.480125E-01
-8.275523E-03
-2.448524E-01
-6.977697E-03
-2.436311E-01
-7.489666E-03
-2.248261E-01
-6.983599E-03
-6.717077E-02
-9.275956E-04
-4.731066E-02
-3.124630E-04
-8.581231E-02
-1.170765E-03
-2.015455E-01
-5.727404E-03
-1.747214E-01
-3.928453E-03
-1.459763E-01
-2.610376E-03
-1.928041E-01
-5.431526E-03
-1.326436E-01
-2.700926E-03
-1.950403E-01
-6.678626E-03
-1.195635E-01
-1.740482E-03
-8.319821E-02
-2.457105E-03
-5.199084E-02
-8.828006E-04
-9.589097E-02
-1.548067E-03
-1.287095E-01
-3.340920E-03
-2.500082E-01
-7.508730E-03
-1.935346E-01
-5.219674E-03
-1.617078E-01
-3.813457E-03
-1.854527E-01
-4.327935E-03
-1.469009E-01
-2.610026E-03
-1.461825E-01
-3.217211E-03
-6.828427E-02
-8.825134E-04
-1.130324E-01
-1.720356E-03
-2.114890E-01
-6.553709E-03
-1.990033E-01
-5.173772E-03
-3.695621E-01
-1.648852E-02
-3.985679E-01
-1.776400E-02
-4.317996E-01
-1.968661E-02
-4.168039E-01
-1.881861E-02
-3.168143E-01
-1.633856E-02
-1.765576E-01
-5.283407E-03
-1.593152E-01
-4.604144E-03
-1.293622E-01
-1.916729E-03
-2.979566E-01
-1.047393E-02
-3.451328E-01
-1.555073E-02
-4.833176E-01
-2.633603E-02
-5.627698E-01
-3.356380E-02
-6.205981E-01
-4.614253E-02
-5.667030E-01
-4.186377E-02
-3.633926E-01
-1.532926E-02
-1.863158E-01
-4.282436E-03
-1.141892E-01
-2.085004E-03
-1.558106E-01
-2.875549E-03
-2.977518E-01
-1.072036E-02
-6.281147E-01
-4.728417E-02
-6.712593E-01
-4.960413E-02
-1.056883E+00
-1.367649E-01
-9.587365E-01
-1.078758E-01
-7.458883E-01
-6.448193E-02
-5.376124E-01
-3.468394E-02
-3.326626E-01
-1.382728E-02
-1.715305E-01
-3.663437E-03
-1.682990E-01
-3.326460E-03
-2.809424E-01
-1.063357E-02
-3.850550E-01
-2.020363E-02
-8.686055E-01
-8.923119E-02
-1.305252E+00
-2.173314E-01
-1.246711E+00
-1.850981E-01
-8.484663E-01
-8.472718E-02
-6.548499E-01
-4.947625E-02
-2.303342E-01
-5.911752E-03
-2.386545E-01
-6.839411E-03
-1.627119E-01
-2.886284E-03
-3.438278E-01
-1.334226E-02
-4.891845E-01
-3.041285E-02
-8.909073E-01
-9.620969E-02
-1.255312E+00
-1.734311E-01
-1.169852E+00
-1.621969E-01
-9.218086E-01
-9.573599E-02
-5.068244E-01
-3.491193E-02
-3.003659E-01
-9.829990E-03
-1.957695E-01
-5.152593E-03
-1.886300E-01
-4.844638E-03
-2.305332E-01
-6.488165E-03
-4.823482E-01
-2.794296E-02
-7.462144E-01
-6.544856E-02
-9.896232E-01
-1.097631E-01
-9.014297E-01
-9.720847E-02
-6.453827E-01
-4.960136E-02
-4.680612E-01
-2.551940E-02
-2.958141E-01
-1.060228E-02
-1.573863E-01
-3.574829E-03
-1.346274E-01
-2.606991E-03
-2.151576E-01
-5.865290E-03
-3.725391E-01
-1.667519E-02
-4.869630E-01
-2.818017E-02
-6.480100E-01
-5.048920E-02
-6.074075E-01
-5.206769E-02
-4.501793E-01
-2.531848E-02
-3.790470E-01
-1.851680E-02
-2.452106E-01
-7.276116E-03
-1.402939E-01
-2.997945E-03
-1.577787E-01
-2.960256E-03
-1.659923E-01
-3.686020E-03
-2.064830E-01
-6.139283E-03
-3.154830E-01
-1.105998E-02
-4.082087E-01
-1.828447E-02
-3.712626E-01
-1.597510E-02
-3.971745E-01
-1.721238E-02
-3.019064E-01
-1.052699E-02
-1.828928E-01
-4.248902E-03
-1.233601E-01
-2.166273E-03
-8.357176E-02
-1.039130E-03
-1.492118E-01
-3.605953E-03
-1.685975E-01
-3.436440E-03
-1.741635E-01
-4.786790E-03
-1.890091E-01
-4.516094E-03
-2.283632E-01
-6.314480E-03
-2.656566E-01
-8.538973E-03
-1.402148E-01
-3.495565E-03
-8.649749E-02
-1.100158E-03
-8.813243E-02
-1.064695E-03
-4.555958E-02
-6.107386E-04
-1.309527E-01
-2.731943E-03
-1.264672E-01
-2.142006E-03
-3.000507E-01
-1.065688E-02
-3.237002E-01
-1.209173E-02
-2.307443E-01
-7.102755E-03
-1.661595E-01
-4.258378E-03
-1.386893E-01
-3.229314E-03
-8.165890E-02
-9.243538E-04
-9.523925E-02
-1.956679E-03
-1.141044E-01
-2.428038E-03
-1.740908E-01
-3.775648E-03
-1.944806E-01
-4.977204E-03
-2.742895E-01
-8.190026E-03
-4.026905E-01
-1.975388E-02
-4.110115E-01
-1.874949E-02
-2.531408E-01
-7.828810E-03
-2.295291E-01
-6.890997E-03
-2.221209E-01
-6.094039E-03
-1.321954E-01
-2.553334E-03
-1.666256E-01
-4.426400E-03
-2.171404E-01
-6.076897E-03
-3.633640E-01
-1.502241E-02
-5.792842E-01
-3.974284E-02
-6.573016E-01
-5.041895E-02
-5.370335E-01
-3.858979E-02
-6.553493E-01
-5.021005E-02
-4.574564E-01
-2.381874E-02
-3.948129E-01
-1.754777E-02
-1.514078E-01
-3.617861E-03
-1.672928E-01
-3.337911E-03
-2.716967E-01
-8.803461E-03
-5.682403E-01
-3.764689E-02
-8.144576E-01
-8.737915E-02
-1.222427E+00
-1.615304E-01
-1.406450E+00
-2.161620E-01
-9.190365E-01
-9.711802E-02
-5.724671E-01
-3.647197E-02
-3.613345E-01
-1.386290E-02
-1.868095E-01
-3.836399E-03
-2.244663E-01
-5.650733E-03
-3.340151E-01
-1.419108E-02
-5.201277E-01
-3.061828E-02
-1.212509E+00
-1.609699E-01
-4.267920E+00
-1.910806E+00
-4.227114E+00
-1.859722E+00
-1.233210E+00
-1.636276E-01
-6.793213E-01
-5.401213E-02
-3.156364E-01
-1.221711E-02
-1.862610E-01
-4.406388E-03
-2.147662E-01
-5.433421E-03
-3.138361E-01
-1.254893E-02
-6.467791E-01
-4.949991E-02
-1.292908E+00
-1.841406E-01
-4.571133E+00
-2.199170E+00
-4.304366E+00
-1.934972E+00
-1.361497E+00
-2.027947E-01
-6.505924E-01
-4.666856E-02
-3.615811E-01
-1.447718E-02
-2.447963E-01
-7.854969E-03
-1.654784E-01
-4.247475E-03
-2.649194E-01
-1.051513E-02
-6.278811E-01
-4.683999E-02
-8.592361E-01
-8.990276E-02
-1.382839E+00
-2.107838E-01
-1.135130E+00
-1.382627E-01
-9.661898E-01
-1.164265E-01
-5.142024E-01
-3.024987E-02
-2.975162E-01
-9.543763E-03
-1.876877E-01
-4.835176E-03
-1.730644E-01
-3.300158E-03
-2.265572E-01
-7.086879E-03
-4.539714E-01
-2.260730E-02
-4.526763E-01
-2.455356E-02
-8.380497E-01
-7.969257E-02
-6.097070E-01
-3.995479E-02
-6.978494E-01
-5.538934E-02
-4.583192E-01
-2.651122E-02
-2.487859E-01
-6.745574E-03
-2.135994E-01
-7.272300E-03
-2.313010E-01
-7.739556E-03
-2.374439E-01
-8.831961E-03
-2.928583E-01
-1.186840E-02
-2.940020E-01
-9.794156E-03
-4.513060E-01
-2.594396E-02
-3.408815E-01
-1.439810E-02
-3.106891E-01
-1.144803E-02
-3.403069E-01
-1.268580E-02
-1.465408E-01
-2.813252E-03
-1.367546E-01
-2.740789E-03
-1.174094E-01
-2.667947E-03
-1.443079E-01
-2.844402E-03
-9.912399E-02
-1.868517E-03
-2.216936E-01
-5.865658E-03
-2.574848E-01
-7.753799E-03
-2.423469E-01
-6.852465E-03
-2.550700E-01
-1.011995E-02
-1.640218E-01
-3.672006E-03
-1.871862E-01
-4.742433E-03
-1.058744E-01
-2.396856E-03
-7.436797E-02
-1.038777E-03
-1.410499E-01
-3.203643E-03
-9.735284E-02
-1.185189E-03
-1.816982E-01
-4.474357E-03
-2.007849E-01
-5.112077E-03
-1.416364E-01
-2.343860E-03
-2.097978E-01
-8.245740E-03
-2.159614E-01
-6.154601E-03
-2.038247E-01
-5.452430E-03
-9.120379E-02
-1.840216E-03
-1.349742E-01
-2.504188E-03
-1.795569E-01
-4.117727E-03
-2.675136E-01
-8.973198E-03
-3.044579E-01
-1.168982E-02
-3.003136E-01
-1.182153E-02
-4.441106E-01
-2.285936E-02
-3.907089E-01
-1.770627E-02
-3.345364E-01
-1.299223E-02
-1.614780E-01
-3.943314E-03
-1.518321E-01
-3.298050E-03
-1.476469E-01
-3.292917E-03
-2.898729E-01
-1.012881E-02
-3.831674E-01
-1.706626E-02
-5.444391E-01
-3.551092E-02
-5.883316E-01
-3.857351E-02
-8.055244E-01
-7.407530E-02
-5.029322E-01
-3.156083E-02
-4.112561E-01
-2.349214E-02
-2.865882E-01
-9.222808E-03
-1.315274E-01
-2.025984E-03
-1.692347E-01
-5.943449E-03
-2.561683E-01
-9.086015E-03
-6.853967E-01
-5.662300E-02
-7.696698E-01
-7.205977E-02
-1.205382E+00
-1.530951E-01
-1.516911E+00
-2.710712E-01
-6.441196E-01
-4.644860E-02
-5.631822E-01
-4.613548E-02
-4.366129E-01
-2.169977E-02
-1.360192E-01
-2.392896E-03
-2.663718E-01
-9.395499E-03
-3.537282E-01
-1.600143E-02
-7.998053E-01
-7.670496E-02
-1.124722E+00
-1.372134E-01
-4.114708E+00
-1.791984E+00
-3.713956E+00
-1.432033E+00
-1.553058E+00
-2.512378E-01
-6.135941E-01
-4.664131E-02
-2.960858E-01
-1.062685E-02
-2.126076E-01
-6.791986E-03
-1.776585E-01
-4.588826E-03
-4.009987E-01
-1.935283E-02
-6.974237E-01
-5.462807E-02
-1.172320E+00
-1.490257E-01
-4.632606E+00
-2.269726E+00
-4.302933E+00
-1.909275E+00
-1.441901E+00
-2.253633E-01
-6.946025E-01
-5.477741E-02
-3.028572E-01
-9.995543E-03
-2.664800E-01
-8.114532E-03
-1.790515E-01
-4.363179E-03
-3.219591E-01
-1.154933E-02
-4.766048E-01
-2.623379E-02
-6.590219E-01
-5.182644E-02
-1.344103E+00
-1.870469E-01
-1.520658E+00
-2.437423E-01
-8.249516E-01
-8.014323E-02
-4.799528E-01
-2.728872E-02
-3.338091E-01
-1.258397E-02
-1.726451E-01
-3.517931E-03
-1.903056E-01
-5.121011E-03
-2.235869E-01
-6.195184E-03
-4.092350E-01
-1.860896E-02
-6.443407E-01
-4.753054E-02
-7.434275E-01
-6.152443E-02
-6.963186E-01
-5.524192E-02
-7.270762E-01
-6.487099E-02
-4.104319E-01
-2.113108E-02
-2.610332E-01
-8.341277E-03
-2.276467E-01
-7.079821E-03
-1.199303E-01
-2.107276E-03
-2.344765E-01
-7.515146E-03
-2.451220E-01
-8.310971E-03
-3.329565E-01
-1.431369E-02
-4.870420E-01
-2.883252E-02
-4.388732E-01
-2.334318E-02
-2.729832E-01
-1.331202E-02
-2.744247E-01
-9.030846E-03
-1.839791E-01
-4.150617E-03
-1.213890E-01
-3.277981E-03
-1.343672E-01
-2.619580E-03
-1.130422E-01
-2.462443E-03
-1.459336E-01
-2.484655E-03
-2.470614E-01
-7.228380E-03
-3.720114E-01
-1.471500E-02
-1.858744E-01
-4.441917E-03
-1.994268E-01
-4.419502E-03
-1.569202E-01
-3.503970E-03
-1.060675E-01
-1.816154E-03
-7.163514E-02
-8.735272E-04
-1.348760E-01
-3.157312E-03
-1.387692E-01
-2.620702E-03
-1.253738E-01
-2.347752E-03
-1.537875E-01
-3.483744E-03
-2.131755E-01
-5.511261E-03
-1.743480E-01
-3.911447E-03
-2.494725E-01
-7.777487E-03
-2.239382E-01
-7.615366E-03
-1.303960E-01
-2.333665E-03
-5.381387E-02
-3.817146E-04
-1.241519E-01
-2.433480E-03
-2.044311E-01
-4.786937E-03
-2.139543E-01
-6.602658E-03
-1.648073E-01
-3.517309E-03
-2.594795E-01
-9.019644E-03
-3.528032E-01
-1.338298E-02
-3.380248E-01
-1.227721E-02
-2.624372E-01
-8.835121E-03
-1.442538E-01
-3.516238E-03
-8.640530E-02
-1.102412E-03
-2.318335E-01
-6.603252E-03
-3.742742E-01
-1.745484E-02
-5.122567E-01
-3.062512E-02
-4.337463E-01
-2.546284E-02
-5.554541E-01
-3.321204E-02
-5.067434E-01
-2.756649E-02
-4.865666E-01
-2.851594E-02
-3.170831E-01
-1.371214E-02
-2.129101E-01
-6.053342E-03
-2.128070E-01
-7.648402E-03
-1.255629E-01
-1.948581E-03
-3.102388E-01
-1.048609E-02
-5.023490E-01
-3.068085E-02
-7.297304E-01
-6.002099E-02
-7.643998E-01
-7.101610E-02
-8.513612E-01
-8.749837E-02
-6.346410E-01
-4.868689E-02
-3.918803E-01
-2.306037E-02
-3.228690E-01
-1.113733E-02
-1.888798E-01
-5.346454E-03
-2.238570E-01
-5.467591E-03
-2.966176E-01
-1.248345E-02
-5.167505E-01
-3.402812E-02
-8.408580E-01
-7.498379E-02
-1.177612E+00
-1.493796E-01
-1.213429E+00
-1.710532E-01
-7.914586E-01
-8.003283E-02
-6.569462E-01
-4.890438E-02
-4.014122E-01
-1.892526E-02
-1.741005E-01
-3.674254E-03
-1.958982E-01
-5.115746E-03
-3.647228E-01
-1.505221E-02
-5.296653E-01
-2.974185E-02
-8.741589E-01
-8.241692E-02
-1.160357E+00
-1.460044E-01
-1.242926E+00
-1.872176E-01
-7.404224E-01
-7.498948E-02
-4.157637E-01
-2.024853E-02
-3.331424E-01
-1.418197E-02
-1.662525E-01
-3.292552E-03
-1.756303E-01
-4.247818E-03
-3.095415E-01
-1.142281E-02
-4.457274E-01
-2.647548E-02
-8.198863E-01
-7.837270E-02
-8.282276E-01
-7.382650E-02
-9.034572E-01
-9.315387E-02
-6.713558E-01
-6.787067E-02
-4.095750E-01
-1.979096E-02
-4.342550E-01
-2.175150E-02
-1.322553E-01
-2.335662E-03
-7.877879E-02
-1.036092E-03
-2.712902E-01
-1.019092E-02
-3.167190E-01
-1.335793E-02
-5.158618E-01
-3.370797E-02
-5.676681E-01
-3.856145E-02
-4.544440E-01
-2.549015E-02
-4.432888E-01
-2.126301E-02
-3.161041E-01
-1.234645E-02
-2.562026E-01
-7.985736E-03
-1.563374E-01
-3.245008E-03
-8.863898E-02
-1.306731E-03
-1.548733E-01
-3.412279E-03
-3.079218E-01
-1.069274E-02
-3.174567E-01
-1.269551E-02
-3.884142E-01
-1.709017E-02
-3.349271E-01
-1.222785E-02
-3.044983E-01
-1.423699E-02
-2.903925E-01
-9.489097E-03
-1.487595E-01
-2.773453E-03
-1.494058E-01
-2.846313E-03
-4.625762E-02
-6.009114E-04
-8.974298E-02
-9.375211E-04
-1.601786E-01
-4.585595E-03
-1.785646E-01
-4.336702E-03
-2.477972E-01
-7.750073E-03
-2.297032E-01
-6.245973E-03
-1.883691E-01
-4.541820E-03
-1.590142E-01
-3.260631E-03
-1.554108E-01
-4.270743E-03
-7.224886E-02
-8.834373E-04
-9.019638E-02
-1.611295E-03
-1.303901E-01
-2.764679E-03
-1.222936E-01
-2.240408E-03
-1.581304E-01
-3.695801E-03
-1.808779E-01
-3.998170E-03
-1.889571E-01
-4.444562E-03
-1.943967E-01
-4.459891E-03
-1.426015E-01
-2.562593E-03
-9.883790E-02
-1.983226E-03
-7.007983E-02
-7.319313E-04
-1.280076E-01
-2.520103E-03
-2.289759E-01
-6.569922E-03
-2.383089E-01
-6.703841E-03
-2.643140E-01
-9.790031E-03
-2.811310E-01
-8.775540E-03
-2.387165E-01
-7.680438E-03
-2.082093E-01
-4.991376E-03
-1.666022E-01
-5.373828E-03
-1.149541E-01
-1.639607E-03
-1.220668E-01
-2.216590E-03
-1.340186E-01
-2.951310E-03
-2.402611E-01
-6.073468E-03
-2.713634E-01
-8.566663E-03
-3.660427E-01
-1.616450E-02
-3.595602E-01
-1.586479E-02
-4.709360E-01
-2.736173E-02
-3.929542E-01
-1.710164E-02
-2.484219E-01
-8.065603E-03
-1.636269E-01
-3.625941E-03
-1.083314E-01
-1.503478E-03
-1.510553E-01
-3.275953E-03
-2.604648E-01
-7.914689E-03
-4.659340E-01
-2.706966E-02
-4.604958E-01
-2.466857E-02
-6.423896E-01
-5.370929E-02
-4.993435E-01
-3.139490E-02
-4.512831E-01
-2.316067E-02
-3.742188E-01
-1.866260E-02
-2.498718E-01
-9.012857E-03
-1.514092E-01
-3.487353E-03
-1.216650E-01
-2.493133E-03
-3.141187E-01
-1.212145E-02
-3.573130E-01
-1.672769E-02
-4.548534E-01
-2.472124E-02
-6.482388E-01
-4.852353E-02
-7.058570E-01
-5.448241E-02
-6.148571E-01
-4.270398E-02
-4.455893E-01
-2.579049E-02
-3.074559E-01
-1.128795E-02
-1.589893E-01
-3.478790E-03
-1.619699E-01
-3.585731E-03
-3.432049E-01
-1.277974E-02
-3.770375E-01
-1.987838E-02
-4.941913E-01
-2.727393E-02
-7.067789E-01
-5.775428E-02
-6.507162E-01
-4.675889E-02
-4.514535E-01
-2.501083E-02
-4.060220E-01
-1.794153E-02
-2.870835E-01
-9.368435E-03
-2.032184E-01
-5.194567E-03
-1.500232E-01
-3.209360E-03
-2.247567E-01
-6.429339E-03
-4.176628E-01
-2.402640E-02
-4.329508E-01
-2.267303E-02
-6.043048E-01
-3.982372E-02
-5.849860E-01
-3.657295E-02
-3.903656E-01
-2.120434E-02
-3.543847E-01
-1.568913E-02
-2.824890E-01
-9.829374E-03
-1.446874E-01
-3.872867E-03
-9.609740E-02
-1.572744E-03
-3.043448E-01
-1.189455E-02
-3.284045E-01
-1.210523E-02
-3.703590E-01
-1.909858E-02
-3.991370E-01
-1.981940E-02
-3.532581E-01
-1.465522E-02
-3.160296E-01
-1.372436E-02
-3.333697E-01
-1.223435E-02
-2.249296E-01
-6.801086E-03
-1.628327E-01
-3.377881E-03
-7.079336E-02
-8.561171E-04
-1.105650E-01
-1.955407E-03
-1.589050E-01
-3.902915E-03
-2.414331E-01
-7.590068E-03
-2.176293E-01
-5.727003E-03
-2.726467E-01
-9.337718E-03
-1.818539E-01
-3.576974E-03
-2.180168E-01
-6.336070E-03
-1.903736E-01
-5.558784E-03
-1.433931E-01
-2.788824E-03
-8.437203E-02
-1.544760E-03
-1.159951E-01
-1.971890E-03
-1.542921E-01
-2.942637E-03
-1.798106E-01
-4.414091E-03
-2.351155E-01
-6.895402E-03
-1.878790E-01
-5.021441E-03
-1.615985E-01
-3.901096E-03
-1.133366E-01
-1.754982E-03
-8.959341E-02
-1.548148E-03
-4.455245E-02
-4.150367E-04
-9.594518E-02
-1.952932E-03
-6.555887E-02
-7.561836E-04
-1.323975E-01
-2.792090E-03
-1.823800E-01
-6.046172E-03
-1.840112E-01
-5.611376E-03
-1.405650E-01
-4.207768E-03
-9.692459E-02
-1.219361E-03
-6.977514E-02
-7.637517E-04
-5.313139E-02
-5.751260E-04
-4.631552E-02
-5.181770E-04
-9.495661E-02
-1.419966E-03
-1.200447E-01
-2.077537E-03
-1.952442E-01
-4.590395E-03
-1.471117E-01
-3.028305E-03
-1.514228E-01
-2.942798E-03
-3.062551E-01
-1.122418E-02
-1.534497E-01
-2.980148E-03
-1.773128E-01
-4.163631E-03
-1.581280E-01
-3.230054E-03
-1.026207E-01
-1.722791E-03
-9.727136E-02
-1.353541E-03
-1.833104E-01
-4.064796E-03
-1.726271E-01
-3.698889E-03
-2.777797E-01
-1.009800E-02
-2.297180E-01
-6.584276E-03
-3.227158E-01
-1.178834E-02
-2.630960E-01
-9.478703E-03
-2.057216E-01
-5.184325E-03
-1.381855E-01
-3.483987E-03
-1.207644E-01
-2.491839E-03
-1.020355E-01
-1.285191E-03
-2.413347E-01
-7.206284E-03
-1.830190E-01
-4.936379E-03
-2.466750E-01
-7.737265E-03
-3.667100E-01
-1.823639E-02
-3.886601E-01
-1.908900E-02
-3.063991E-01
-1.145076E-02
-3.179609E-01
-1.267020E-02
-2.640979E-01
-8.849372E-03
-1.324137E-01
-3.423783E-03
-1.674432E-01
-3.867189E-03
-2.387486E-01
-7.617983E-03
-2.702949E-01
-9.072068E-03
-3.509396E-01
-1.367373E-02
-4.669900E-01
-2.481995E-02
-4.539417E-01
-2.445131E-02
-2.804180E-01
-9.256761E-03
-2.204163E-01
-5.757785E-03
-1.688854E-01
-3.626841E-03
-1.799124E-01
-4.569449E-03
-1.357315E-01
-3.117868E-03
-1.939662E-01
-4.609676E-03
-1.811233E-01
-4.001677E-03
-3.023547E-01
-1.006813E-02
-3.852946E-01
-1.646521E-02
-3.947190E-01
-1.652818E-02
-3.308085E-01
-1.319117E-02
-2.203472E-01
-7.096957E-03
-2.084519E-01
-6.333576E-03
-1.446787E-01
-3.971664E-03
-8.614610E-02
-1.069819E-03
-2.193677E-01
-8.326726E-03
-2.076369E-01
-4.682464E-03
-1.696243E-01
-3.956462E-03
-3.992762E-01
-1.931929E-02
-3.307711E-01
-1.232965E-02
-2.639926E-01
-8.553712E-03
-2.907994E-01
-1.195800E-02
-2.069794E-01
-4.706478E-03
-9.533912E-02
-1.278173E-03
-1.053247E-01
-1.903155E-03
-1.837208E-01
-5.173191E-03
-1.636891E-01
-4.284691E-03
-2.284680E-01
-8.035892E-03
-2.300168E-01
-5.784482E-03
-2.519821E-01
-8.684849E-03
-2.271669E-01
-6.331342E-03
-2.491848E-01
-7.449392E-03
-2.027002E-01
-4.880471E-03
-9.012995E-02
-1.564717E-03
-9.958124E-02
-1.614296E-03
-1.735102E-01
-5.642665E-03
-1.785074E-01
-4.132173E-03
-1.933132E-01
-5.239277E-03
-2.139676E-01
-6.356521E-03
-2.015977E-01
-5.099277E-03
-2.039189E-01
-7.545412E-03
-2.075736E-01
-7.064068E-03
-1.061529E-01
-1.352122E-03
-3.214966E-02
-1.717861E-04
-3.339740E-02
-2.480850E-04
-1.110320E-01
-2.164188E-03
-9.636462E-02
-1.094431E-03
-1.497850E-01
-5.420438E-03
-1.496108E-01
-2.948765E-03
-1.408888E-01
-2.897433E-03
-1.338729E-01
-2.922319E-03
-5.711633E-02
-4.306501E-04
-7.981911E-02
-8.325283E-04
-5.180954E-02
-5.871992E-04
-3.142337E-02
-2.743459E-04
-7.558078E-02
-1.440107E-03
-6.749596E-02
-7.121686E-04
-4.742528E-02
-3.421264E-04
-1.152645E-01
-2.543824E-03
-1.034826E-01
-1.553063E-03
-7.780836E-02
-1.674226E-03
-2.486040E-02
-1.152553E-04
-5.118031E-02
-4.782731E-04
-6.164448E-02
-1.090465E-03
-5.579780E-02
-5.469202E-04
-9.835519E-02
-1.561650E-03
-1.590188E-01
-3.559315E-03
-9.123141E-02
-1.186111E-03
-9.257051E-02
-1.160366E-03
-1.595071E-01
-3.372622E-03
-8.648914E-02
-1.391423E-03
-9.915992E-02
-1.496092E-03
-6.159336E-02
-7.871872E-04
-7.703115E-02
-8.995936E-04
-8.644781E-02
-1.794389E-03
-8.281040E-02
-1.022772E-03
-1.198087E-01
-2.578187E-03
-1.046543E-01
-2.073804E-03
-1.485974E-01
-3.372341E-03
-1.899240E-01
-5.053348E-03
-1.495518E-01
-3.346868E-03
-1.523611E-01
-2.626194E-03
-1.483976E-01
-3.461823E-03
-1.189640E-01
-2.194057E-03
-7.910820E-02
-1.021972E-03
-1.408445E-01
-2.513931E-03
-1.785598E-01
-6.539443E-03
-1.627058E-01
-4.133768E-03
-1.417975E-01
-2.575062E-03
-1.453104E-01
-3.242010E-03
-1.545322E-01
-2.888223E-03
-2.238452E-01
-8.182427E-03
-1.208627E-01
-2.044210E-03
-8.317750E-02
-1.508722E-03
-9.945978E-02
-1.606528E-03
-1.100115E-01
-1.679926E-03
-1.682495E-01
-3.387004E-03
-2.038347E-01
-5.001616E-03
-1.661126E-01
-3.716273E-03
-1.719126E-01
-4.353756E-03
-2.127676E-01
-7.068298E-03
-1.596044E-01
-3.435511E-03
-9.171613E-02
-1.258097E-03
-7.909923E-02
-1.167334E-03
-8.070294E-02
-1.198068E-03
-9.480490E-02
-1.184376E-03
-1.091868E-01
-1.673174E-03
-1.686522E-01
-3.814685E-03
-2.045902E-01
-4.997184E-03
-2.218509E-01
-5.932778E-03
-2.568657E-01
-9.334526E-03
-1.632220E-01
-4.266101E-03
-8.403406E-02
-1.398023E-03
-8.197852E-02
-9.887532E-04
-7.879086E-02
-1.433937E-03
-1.228523E-01
-2.416939E-03
-1.862098E-01
-4.308366E-03
-2.142186E-01
-8.247066E-03
-2.268010E-01
-6.502538E-03
-1.402457E-01
-2.618558E-03
-1.260213E-01
-2.059778E-03
-1.505995E-01
-2.876582E-03
-5.116714E-02
-3.766772E-04
-1.268702E-01
-2.695645E-03
-5.638152E-02
-5.767254E-04
-1.619056E-01
-3.154405E-03
-2.354666E-01
-1.065017E-02
-1.278153E-01
-2.300850E-03
-1.582320E-01
-3.193514E-03
-1.851274E-01
-5.144918E-03
-1.462501E-01
-3.549186E-03
-1.385494E-01
-3.784085E-03
-6.277077E-02
-8.146319E-04
-7.619565E-02
-1.435724E-03
-1.261746E-01
-3.287745E-03
-5.858084E-02
-5.268907E-04
-1.326578E-01
-2.611109E-03
-1.378942E-01
-2.421025E-03
-1.281363E-01
-1.960588E-03
-1.071155E-01
-1.748974E-03
-1.014830E-01
-1.540688E-03
-1.167308E-01
-3.039772E-03
-8.499870E-02
-1.048605E-03
-5.967367E-02
-1.011919E-03
-6.384520E-02
-1.050476E-03
-5.379547E-02
-4.842685E-04
-9.714870E-02
-1.167567E-03
-1.193232E-01
-2.711280E-03
-6.956983E-02
-7.545215E-04
-1.085462E-01
-2.036623E-03
-6.352672E-02
-7.273361E-04
-3.554724E-02
-4.034308E-04
-1.147332E-01
-3.617311E-03
-8.657826E-02
-1.515787E-03
-tally 2:
-3.142337E-02
-2.743459E-04
-9.594518E-02
-1.952932E-03
-9.019638E-02
-1.611295E-03
-1.348760E-01
-3.157312E-03
-7.436797E-02
-1.038777E-03
-4.555958E-02
-6.107386E-04
-5.199084E-02
-8.828006E-04
-5.105046E-02
-5.591936E-04
-1.095224E-01
-2.675022E-03
-2.084815E-02
-1.082750E-04
-5.579780E-02
-5.469202E-04
-9.495661E-02
-1.419966E-03
-1.280076E-01
-2.520103E-03
-1.241519E-01
-2.433480E-03
-1.349742E-01
-2.504188E-03
-1.141044E-01
-2.428038E-03
-1.130324E-01
-1.720356E-03
-1.137084E-01
-1.891251E-03
-9.882155E-02
-1.696404E-03
-6.040159E-02
-7.575405E-04
-8.644781E-02
-1.794389E-03
-9.727136E-02
-1.353541E-03
-1.340186E-01
-2.951310E-03
-2.318335E-01
-6.603252E-03
-1.476469E-01
-3.292917E-03
-1.666256E-01
-4.426400E-03
-1.293622E-01
-1.916729E-03
-1.918440E-01
-4.887813E-03
-1.680575E-01
-3.208887E-03
-4.923095E-02
-6.563588E-04
-7.910820E-02
-1.021972E-03
-1.020355E-01
-1.285191E-03
-1.510553E-01
-3.275953E-03
-1.255629E-01
-1.948581E-03
-1.692347E-01
-5.943449E-03
-1.672928E-01
-3.337911E-03
-1.558106E-01
-2.875549E-03
-1.060074E-01
-1.569679E-03
-6.877708E-02
-1.029829E-03
-8.362502E-02
-1.022521E-03
-9.945978E-02
-1.606528E-03
-1.674432E-01
-3.867189E-03
-1.216650E-01
-2.493133E-03
-2.238570E-01
-5.467591E-03
-2.663718E-01
-9.395499E-03
-2.244663E-01
-5.650733E-03
-1.682990E-01
-3.326460E-03
-1.290019E-01
-2.856345E-03
-1.239696E-01
-2.379611E-03
-1.458566E-01
-4.113559E-03
-8.070294E-02
-1.198068E-03
-1.357315E-01
-3.117868E-03
-1.619699E-01
-3.585731E-03
-1.958982E-01
-5.115746E-03
-1.776585E-01
-4.588826E-03
-2.147662E-01
-5.433421E-03
-1.627119E-01
-2.886284E-03
-1.796564E-01
-4.684076E-03
-1.086029E-01
-1.976496E-03
-8.785791E-02
-1.103156E-03
-7.879086E-02
-1.433937E-03
-8.614610E-02
-1.069819E-03
-1.500232E-01
-3.209360E-03
-1.756303E-01
-4.247818E-03
-1.790515E-01
-4.363179E-03
-1.654784E-01
-4.247475E-03
-1.886300E-01
-4.844638E-03
-1.374646E-01
-2.373831E-03
-1.262352E-01
-2.754572E-03
-2.298462E-02
-1.395953E-04
-5.638152E-02
-5.767254E-04
-1.053247E-01
-1.903155E-03
-9.609740E-02
-1.572744E-03
-7.877879E-02
-1.036092E-03
-1.903056E-01
-5.121011E-03
-1.730644E-01
-3.300158E-03
-1.346274E-01
-2.606991E-03
-9.714578E-02
-1.698684E-03
-1.273408E-01
-2.552547E-03
-5.037871E-02
-5.560040E-04
-1.261746E-01
-3.287745E-03
-9.958124E-02
-1.614296E-03
-7.079336E-02
-8.561171E-04
-8.863898E-02
-1.306731E-03
-1.199303E-01
-2.107276E-03
-2.313010E-01
-7.739556E-03
-1.577787E-01
-2.960256E-03
-8.639730E-02
-1.201841E-03
-5.659795E-02
-4.694852E-04
-5.104294E-02
-5.268938E-04
-6.384520E-02
-1.050476E-03
-3.339740E-02
-2.480850E-04
-8.437203E-02
-1.544760E-03
-4.625762E-02
-6.009114E-04
-1.343672E-01
-2.619580E-03
-1.174094E-01
-2.667947E-03
-8.357176E-02
-1.039130E-03
-4.731066E-02
-3.124630E-04
-4.749930E-02
-5.129237E-04
-3.878239E-02
-5.236943E-04
-7.558078E-02
-1.440107E-03
-6.555887E-02
-7.561836E-04
-1.303901E-01
-2.764679E-03
-1.387692E-01
-2.620702E-03
-1.410499E-01
-3.203643E-03
-1.309527E-01
-2.731943E-03
-9.589097E-02
-1.548067E-03
-5.609383E-02
-5.921134E-04
-1.096306E-01
-2.122353E-03
-6.381818E-02
-9.439513E-04
-9.835519E-02
-1.561650E-03
-1.200447E-01
-2.077537E-03
-2.289759E-01
-6.569922E-03
-2.044311E-01
-4.786937E-03
-1.795569E-01
-4.117727E-03
-1.740908E-01
-3.775648E-03
-2.114890E-01
-6.553709E-03
-1.350332E-01
-3.254232E-03
-1.354820E-01
-2.909227E-03
-1.050048E-01
-2.108780E-03
-8.281040E-02
-1.022772E-03
-1.833104E-01
-4.064796E-03
-2.402611E-01
-6.073468E-03
-3.742742E-01
-1.745484E-02
-2.898729E-01
-1.012881E-02
-2.171404E-01
-6.076897E-03
-2.979566E-01
-1.047393E-02
-2.109751E-01
-5.543123E-03
-1.422788E-01
-4.002215E-03
-9.650255E-02
-1.789194E-03
-1.408445E-01
-2.513931E-03
-2.413347E-01
-7.206284E-03
-2.604648E-01
-7.914689E-03
-3.102388E-01
-1.048609E-02
-2.561683E-01
-9.086015E-03
-2.716967E-01
-8.803461E-03
-2.977518E-01
-1.072036E-02
-3.421581E-01
-1.371034E-02
-1.976808E-01
-6.130857E-03
-1.456806E-01
-3.692821E-03
-1.100115E-01
-1.679926E-03
-2.387486E-01
-7.617983E-03
-3.141187E-01
-1.212145E-02
-2.966176E-01
-1.248345E-02
-3.537282E-01
-1.600143E-02
-3.340151E-01
-1.419108E-02
-2.809424E-01
-1.063357E-02
-2.844146E-01
-9.114045E-03
-2.163287E-01
-5.949023E-03
-2.049774E-01
-6.265197E-03
-9.480490E-02
-1.184376E-03
-1.939662E-01
-4.609676E-03
-3.432049E-01
-1.277974E-02
-3.647228E-01
-1.505221E-02
-4.009987E-01
-1.935283E-02
-3.138361E-01
-1.254893E-02
-3.438278E-01
-1.334226E-02
-2.812314E-01
-1.216852E-02
-2.603220E-01
-8.391117E-03
-1.709025E-01
-4.264016E-03
-1.228523E-01
-2.416939E-03
-2.193677E-01
-8.326726E-03
-2.247567E-01
-6.429339E-03
-3.095415E-01
-1.142281E-02
-3.219591E-01
-1.154933E-02
-2.649194E-01
-1.051513E-02
-2.305332E-01
-6.488165E-03
-2.399512E-01
-9.436021E-03
-2.213458E-01
-6.719185E-03
-1.570027E-01
-4.835079E-03
-1.619056E-01
-3.154405E-03
-1.837208E-01
-5.173191E-03
-3.043448E-01
-1.189455E-02
-2.712902E-01
-1.019092E-02
-2.235869E-01
-6.195184E-03
-2.265572E-01
-7.086879E-03
-2.151576E-01
-5.865290E-03
-1.688968E-01
-3.770170E-03
-1.499070E-01
-3.571856E-03
-8.289459E-02
-1.268000E-03
-5.858084E-02
-5.268907E-04
-1.735102E-01
-5.642665E-03
-1.105650E-01
-1.955407E-03
-1.548733E-01
-3.412279E-03
-2.344765E-01
-7.515146E-03
-2.374439E-01
-8.831961E-03
-1.659923E-01
-3.686020E-03
-1.449879E-01
-2.972972E-03
-9.581840E-02
-1.386427E-03
-9.139465E-02
-1.164619E-03
-5.379547E-02
-4.842685E-04
-1.110320E-01
-2.164188E-03
-1.159951E-01
-1.971890E-03
-8.974298E-02
-9.375211E-04
-1.130422E-01
-2.462443E-03
-1.443079E-01
-2.844402E-03
-1.492118E-01
-3.605953E-03
-8.581231E-02
-1.170765E-03
-6.919528E-02
-9.104379E-04
-6.099196E-02
-1.095513E-03
-6.749596E-02
-7.121686E-04
-1.323975E-01
-2.792090E-03
-1.222936E-01
-2.240408E-03
-1.253738E-01
-2.347752E-03
-9.735284E-02
-1.185189E-03
-1.264672E-01
-2.142006E-03
-1.287095E-01
-3.340920E-03
-9.705482E-02
-1.351531E-03
-1.342330E-01
-3.619967E-03
-1.155641E-01
-2.178751E-03
-1.590188E-01
-3.559315E-03
-1.952442E-01
-4.590395E-03
-2.383089E-01
-6.703841E-03
-2.139543E-01
-6.602658E-03
-2.675136E-01
-8.973198E-03
-1.944806E-01
-4.977204E-03
-1.990033E-01
-5.173772E-03
-1.906275E-01
-4.961645E-03
-1.599751E-01
-2.957031E-03
-1.307457E-01
-2.170448E-03
-1.198087E-01
-2.578187E-03
-1.726271E-01
-3.698889E-03
-2.713634E-01
-8.566663E-03
-5.122567E-01
-3.062512E-02
-3.831674E-01
-1.706626E-02
-3.633640E-01
-1.502241E-02
-3.451328E-01
-1.555073E-02
-2.472924E-01
-8.124732E-03
-1.762382E-01
-4.255455E-03
-1.467738E-01
-3.481509E-03
-1.785598E-01
-6.539443E-03
-1.830190E-01
-4.936379E-03
-4.659340E-01
-2.706966E-02
-5.023490E-01
-3.068085E-02
-6.853967E-01
-5.662300E-02
-5.682403E-01
-3.764689E-02
-6.281147E-01
-4.728417E-02
-4.542071E-01
-2.517473E-02
-3.144113E-01
-1.232063E-02
-1.468696E-01
-3.582954E-03
-1.682495E-01
-3.387004E-03
-2.702949E-01
-9.072068E-03
-3.573130E-01
-1.672769E-02
-5.167505E-01
-3.402812E-02
-7.998053E-01
-7.670496E-02
-5.201277E-01
-3.061828E-02
-3.850550E-01
-2.020363E-02
-4.560916E-01
-2.713184E-02
-2.072743E-01
-5.179000E-03
-2.166930E-01
-7.983860E-03
-1.091868E-01
-1.673174E-03
-1.811233E-01
-4.001677E-03
-3.770375E-01
-1.987838E-02
-5.296653E-01
-2.974185E-02
-6.974237E-01
-5.462807E-02
-6.467791E-01
-4.949991E-02
-4.891845E-01
-3.041285E-02
-4.240103E-01
-2.176819E-02
-2.841149E-01
-1.105366E-02
-1.929437E-01
-4.281538E-03
-1.862098E-01
-4.308366E-03
-2.076369E-01
-4.682464E-03
-4.176628E-01
-2.402640E-02
-4.457274E-01
-2.647548E-02
-4.766048E-01
-2.623379E-02
-6.278811E-01
-4.683999E-02
-4.823482E-01
-2.794296E-02
-4.641786E-01
-2.746647E-02
-3.023706E-01
-1.146381E-02
-1.123717E-01
-1.760314E-03
-2.354666E-01
-1.065017E-02
-1.636891E-01
-4.284691E-03
-3.284045E-01
-1.210523E-02
-3.167190E-01
-1.335793E-02
-4.092350E-01
-1.860896E-02
-4.539714E-01
-2.260730E-02
-3.725391E-01
-1.667519E-02
-2.795405E-01
-9.154147E-03
-2.199953E-01
-7.783541E-03
-1.469691E-01
-4.146173E-03
-1.326578E-01
-2.611109E-03
-1.785074E-01
-4.132173E-03
-1.589050E-01
-3.902915E-03
-3.079218E-01
-1.069274E-02
-2.451220E-01
-8.310971E-03
-2.928583E-01
-1.186840E-02
-2.064830E-01
-6.139283E-03
-1.801392E-01
-3.863618E-03
-2.009835E-01
-6.159157E-03
-7.378130E-02
-1.282188E-03
-9.714870E-02
-1.167567E-03
-9.636462E-02
-1.094431E-03
-1.542921E-01
-2.942637E-03
-1.601786E-01
-4.585595E-03
-1.459336E-01
-2.484655E-03
-9.912399E-02
-1.868517E-03
-1.685975E-01
-3.436440E-03
-2.015455E-01
-5.727404E-03
-1.119151E-01
-2.477462E-03
-9.150086E-02
-1.624380E-03
-4.742528E-02
-3.421264E-04
-1.823800E-01
-6.046172E-03
-1.581304E-01
-3.695801E-03
-1.537875E-01
-3.483744E-03
-1.816982E-01
-4.474357E-03
-3.000507E-01
-1.065688E-02
-2.500082E-01
-7.508730E-03
-1.601898E-01
-3.408525E-03
-1.114064E-01
-1.730639E-03
-6.865908E-02
-7.355866E-04
-9.123141E-02
-1.186111E-03
-1.471117E-01
-3.028305E-03
-2.643140E-01
-9.790031E-03
-1.648073E-01
-3.517309E-03
-3.044579E-01
-1.168982E-02
-2.742895E-01
-8.190026E-03
-3.695621E-01
-1.648852E-02
-2.657405E-01
-8.636878E-03
-2.280781E-01
-6.081628E-03
-9.988454E-02
-1.092936E-03
-1.046543E-01
-2.073804E-03
-2.777797E-01
-1.009800E-02
-3.660427E-01
-1.616450E-02
-4.337463E-01
-2.546284E-02
-5.444391E-01
-3.551092E-02
-5.792842E-01
-3.974284E-02
-4.833176E-01
-2.633603E-02
-4.210681E-01
-1.934743E-02
-2.502725E-01
-7.152209E-03
-1.687123E-01
-5.414669E-03
-1.627058E-01
-4.133768E-03
-2.466750E-01
-7.737265E-03
-4.604958E-01
-2.466857E-02
-7.297304E-01
-6.002099E-02
-7.696698E-01
-7.205977E-02
-8.144576E-01
-8.737915E-02
-6.712593E-01
-4.960413E-02
-5.784381E-01
-3.768770E-02
-3.018257E-01
-1.124658E-02
-1.848215E-01
-5.256814E-03
-2.038347E-01
-5.001616E-03
-3.509396E-01
-1.367373E-02
-4.548534E-01
-2.472124E-02
-8.408580E-01
-7.498379E-02
-1.124722E+00
-1.372134E-01
-1.212509E+00
-1.609699E-01
-8.686055E-01
-8.923119E-02
-7.260552E-01
-5.922762E-02
-3.646146E-01
-1.695667E-02
-1.757110E-01
-5.024516E-03
-1.686522E-01
-3.814685E-03
-3.023547E-01
-1.006813E-02
-4.941913E-01
-2.727393E-02
-8.741589E-01
-8.241692E-02
-1.172320E+00
-1.490257E-01
-1.292908E+00
-1.841406E-01
-8.909073E-01
-9.620969E-02
-5.209518E-01
-3.000472E-02
-3.965469E-01
-1.974149E-02
-1.711011E-01
-3.912611E-03
-2.142186E-01
-8.247066E-03
-1.696243E-01
-3.956462E-03
-4.329508E-01
-2.267303E-02
-8.198863E-01
-7.837270E-02
-6.590219E-01
-5.182644E-02
-8.592361E-01
-8.990276E-02
-7.462144E-01
-6.544856E-02
-4.258629E-01
-2.112979E-02
-3.282506E-01
-1.233694E-02
-1.821249E-01
-6.802302E-03
-1.278153E-01
-2.300850E-03
-2.284680E-01
-8.035892E-03
-3.703590E-01
-1.909858E-02
-5.158618E-01
-3.370797E-02
-6.443407E-01
-4.753054E-02
-4.526763E-01
-2.455356E-02
-4.869630E-01
-2.818017E-02
-3.109678E-01
-1.173563E-02
-2.453178E-01
-7.052370E-03
-1.075211E-01
-1.625602E-03
-1.378942E-01
-2.421025E-03
-1.933132E-01
-5.239277E-03
-2.414331E-01
-7.590068E-03
-3.174567E-01
-1.269551E-02
-3.329565E-01
-1.431369E-02
-2.940020E-01
-9.794156E-03
-3.154830E-01
-1.105998E-02
-1.936577E-01
-4.483865E-03
-1.897439E-01
-7.235399E-03
-8.021098E-02
-7.940912E-04
-1.193232E-01
-2.711280E-03
-1.497850E-01
-5.420438E-03
-1.798106E-01
-4.414091E-03
-1.785646E-01
-4.336702E-03
-2.470614E-01
-7.228380E-03
-2.216936E-01
-5.865658E-03
-1.741635E-01
-4.786790E-03
-1.747214E-01
-3.928453E-03
-1.102521E-01
-1.584592E-03
-5.728387E-02
-5.659010E-04
-1.152645E-01
-2.543824E-03
-1.840112E-01
-5.611376E-03
-1.808779E-01
-3.998170E-03
-2.131755E-01
-5.511261E-03
-2.007849E-01
-5.112077E-03
-3.237002E-01
-1.209173E-02
-1.935346E-01
-5.219674E-03
-1.711068E-01
-3.795257E-03
-1.074251E-01
-1.586218E-03
-6.720820E-02
-7.310529E-04
-9.257051E-02
-1.160366E-03
-1.514228E-01
-2.942798E-03
-2.811310E-01
-8.775540E-03
-2.594795E-01
-9.019644E-03
-3.003136E-01
-1.182153E-02
-4.026905E-01
-1.975388E-02
-3.985679E-01
-1.776400E-02
-3.845292E-01
-1.700936E-02
-2.100930E-01
-5.450110E-03
-1.547083E-01
-3.688477E-03
-1.485974E-01
-3.372341E-03
-2.297180E-01
-6.584276E-03
-3.595602E-01
-1.586479E-02
-5.554541E-01
-3.321204E-02
-5.883316E-01
-3.857351E-02
-6.573016E-01
-5.041895E-02
-5.627698E-01
-3.356380E-02
-3.735043E-01
-1.670088E-02
-3.414429E-01
-1.411003E-02
-1.873036E-01
-4.734353E-03
-1.417975E-01
-2.575062E-03
-3.667100E-01
-1.823639E-02
-6.423896E-01
-5.370929E-02
-7.643998E-01
-7.101610E-02
-1.205382E+00
-1.530951E-01
-1.222427E+00
-1.615304E-01
-1.056883E+00
-1.367649E-01
-4.172596E-01
-1.856012E-02
-2.619717E-01
-8.351589E-03
-2.212472E-01
-5.760540E-03
-1.661126E-01
-3.716273E-03
-4.669900E-01
-2.481995E-02
-6.482388E-01
-4.852353E-02
-1.177612E+00
-1.493796E-01
-4.114708E+00
-1.791984E+00
-4.267920E+00
-1.910806E+00
-1.305252E+00
-2.173314E-01
-7.310584E-01
-6.237152E-02
-3.486264E-01
-1.301568E-02
-2.353728E-01
-7.533032E-03
-2.045902E-01
-4.997184E-03
-3.852946E-01
-1.646521E-02
-7.067789E-01
-5.775428E-02
-1.160357E+00
-1.460044E-01
-4.632606E+00
-2.269726E+00
-4.571133E+00
-2.199170E+00
-1.255312E+00
-1.734311E-01
-6.504938E-01
-4.819256E-02
-3.901607E-01
-1.960621E-02
-1.562002E-01
-3.325900E-03
-2.268010E-01
-6.502538E-03
-3.992762E-01
-1.931929E-02
-6.043048E-01
-3.982372E-02
-8.282276E-01
-7.382650E-02
-1.344103E+00
-1.870469E-01
-1.382839E+00
-2.107838E-01
-9.896232E-01
-1.097631E-01
-6.864289E-01
-5.425243E-02
-2.853774E-01
-1.070129E-02
-2.461041E-01
-7.613043E-03
-1.582320E-01
-3.193514E-03
-2.300168E-01
-5.784482E-03
-3.991370E-01
-1.981940E-02
-5.676681E-01
-3.856145E-02
-7.434275E-01
-6.152443E-02
-8.380497E-01
-7.969257E-02
-6.480100E-01
-5.048920E-02
-3.911757E-01
-1.773775E-02
-2.643229E-01
-9.900690E-03
-2.187908E-01
-6.919967E-03
-1.281363E-01
-1.960588E-03
-2.139676E-01
-6.356521E-03
-2.176293E-01
-5.727003E-03
-3.884142E-01
-1.709017E-02
-4.870420E-01
-2.883252E-02
-4.513060E-01
-2.594396E-02
-4.082087E-01
-1.828447E-02
-2.453357E-01
-9.056291E-03
-1.830639E-01
-5.540521E-03
-1.290978E-01
-2.526036E-03
-6.956983E-02
-7.545215E-04
-1.496108E-01
-2.948765E-03
-2.351155E-01
-6.895402E-03
-2.477972E-01
-7.750073E-03
-3.720114E-01
-1.471500E-02
-2.574848E-01
-7.753799E-03
-1.890091E-01
-4.516094E-03
-1.459763E-01
-2.610376E-03
-1.564084E-01
-3.266574E-03
-9.405318E-02
-1.606034E-03
-1.034826E-01
-1.553063E-03
-1.405650E-01
-4.207768E-03
-1.889571E-01
-4.444562E-03
-1.743480E-01
-3.911447E-03
-1.416364E-01
-2.343860E-03
-2.307443E-01
-7.102755E-03
-1.617078E-01
-3.813457E-03
-2.205615E-01
-7.391402E-03
-1.408447E-01
-2.389426E-03
-9.537792E-02
-1.957273E-03
-1.595071E-01
-3.372622E-03
-3.062551E-01
-1.122418E-02
-2.387165E-01
-7.680438E-03
-3.528032E-01
-1.338298E-02
-4.441106E-01
-2.285936E-02
-4.110115E-01
-1.874949E-02
-4.317996E-01
-1.968661E-02
-2.839796E-01
-9.879629E-03
-2.732779E-01
-8.620164E-03
-8.157999E-02
-1.133034E-03
-1.899240E-01
-5.053348E-03
-3.227158E-01
-1.178834E-02
-4.709360E-01
-2.736173E-02
-5.067434E-01
-2.756649E-02
-8.055244E-01
-7.407530E-02
-5.370335E-01
-3.858979E-02
-6.205981E-01
-4.614253E-02
-4.705633E-01
-2.767424E-02
-2.636737E-01
-9.397976E-03
-1.130087E-01
-1.673004E-03
-1.453104E-01
-3.242010E-03
-3.886601E-01
-1.908900E-02
-4.993435E-01
-3.139490E-02
-8.513612E-01
-8.749837E-02
-1.516911E+00
-2.710712E-01
-1.406450E+00
-2.161620E-01
-9.587365E-01
-1.078758E-01
-5.299200E-01
-3.825470E-02
-3.672028E-01
-1.638863E-02
-2.169211E-01
-5.946348E-03
-1.719126E-01
-4.353756E-03
-4.539417E-01
-2.445131E-02
-7.058570E-01
-5.448241E-02
-1.213429E+00
-1.710532E-01
-3.713956E+00
-1.432033E+00
-4.227114E+00
-1.859722E+00
-1.246711E+00
-1.850981E-01
-6.478348E-01
-5.416126E-02
-3.563685E-01
-1.447225E-02
-1.280409E-01
-2.167446E-03
-2.218509E-01
-5.932778E-03
-3.947190E-01
-1.652818E-02
-6.507162E-01
-4.675889E-02
-1.242926E+00
-1.872176E-01
-4.302933E+00
-1.909275E+00
-4.304366E+00
-1.934972E+00
-1.169852E+00
-1.621969E-01
-5.990305E-01
-4.159076E-02
-3.509285E-01
-1.478774E-02
-2.153821E-01
-5.848786E-03
-1.402457E-01
-2.618558E-03
-3.307711E-01
-1.232965E-02
-5.849860E-01
-3.657295E-02
-9.034572E-01
-9.315387E-02
-1.520658E+00
-2.437423E-01
-1.135130E+00
-1.382627E-01
-9.014297E-01
-9.720847E-02
-6.579119E-01
-5.051533E-02
-2.848374E-01
-9.701790E-03
-1.904001E-01
-4.047242E-03
-1.851274E-01
-5.144918E-03
-2.519821E-01
-8.684849E-03
-3.532581E-01
-1.465522E-02
-4.544440E-01
-2.549015E-02
-6.963186E-01
-5.524192E-02
-6.097070E-01
-3.995479E-02
-6.074075E-01
-5.206769E-02
-4.374549E-01
-2.366240E-02
-2.574947E-01
-8.333501E-03
-1.278025E-01
-2.170886E-03
-1.071155E-01
-1.748974E-03
-2.015977E-01
-5.099277E-03
-2.726467E-01
-9.337718E-03
-3.349271E-01
-1.222785E-02
-4.388732E-01
-2.334318E-02
-3.408815E-01
-1.439810E-02
-3.712626E-01
-1.597510E-02
-2.480125E-01
-8.275523E-03
-1.520639E-01
-2.752778E-03
-9.365705E-02
-1.199392E-03
-1.085462E-01
-2.036623E-03
-1.408888E-01
-2.897433E-03
-1.878790E-01
-5.021441E-03
-2.297032E-01
-6.245973E-03
-1.858744E-01
-4.441917E-03
-2.423469E-01
-6.852465E-03
-2.283632E-01
-6.314480E-03
-1.928041E-01
-5.431526E-03
-1.198104E-01
-2.580046E-03
-8.619696E-02
-1.337493E-03
-7.780836E-02
-1.674226E-03
-9.692459E-02
-1.219361E-03
-1.943967E-01
-4.459891E-03
-2.494725E-01
-7.777487E-03
-2.097978E-01
-8.245740E-03
-1.661595E-01
-4.258378E-03
-1.854527E-01
-4.327935E-03
-1.668188E-01
-3.216331E-03
-1.301662E-01
-3.969782E-03
-1.007744E-01
-1.573169E-03
-8.648914E-02
-1.391423E-03
-1.534497E-01
-2.980148E-03
-2.082093E-01
-4.991376E-03
-3.380248E-01
-1.227721E-02
-3.907089E-01
-1.770627E-02
-2.531408E-01
-7.828810E-03
-4.168039E-01
-1.881861E-02
-2.593192E-01
-7.387676E-03
-1.993743E-01
-5.362856E-03
-1.368232E-01
-2.667957E-03
-1.495518E-01
-3.346868E-03
-2.630960E-01
-9.478703E-03
-3.929542E-01
-1.710164E-02
-4.865666E-01
-2.851594E-02
-5.029322E-01
-3.156083E-02
-6.553493E-01
-5.021005E-02
-5.667030E-01
-4.186377E-02
-4.105274E-01
-2.102523E-02
-2.247647E-01
-7.123896E-03
-1.695614E-01
-3.526426E-03
-1.545322E-01
-2.888223E-03
-3.063991E-01
-1.145076E-02
-4.512831E-01
-2.316067E-02
-6.346410E-01
-4.868689E-02
-6.441196E-01
-4.644860E-02
-9.190365E-01
-9.711802E-02
-7.458883E-01
-6.448193E-02
-5.178634E-01
-3.589903E-02
-3.059552E-01
-1.103037E-02
-1.919182E-01
-7.063068E-03
-2.127676E-01
-7.068298E-03
-2.804180E-01
-9.256761E-03
-6.148571E-01
-4.270398E-02
-7.914586E-01
-8.003283E-02
-1.553058E+00
-2.512378E-01
-1.233210E+00
-1.636276E-01
-8.484663E-01
-8.472718E-02
-4.846913E-01
-3.277993E-02
-2.970379E-01
-1.009480E-02
-1.648011E-01
-3.936025E-03
-2.568657E-01
-9.334526E-03
-3.308085E-01
-1.319117E-02
-4.514535E-01
-2.501083E-02
-7.404224E-01
-7.498948E-02
-1.441901E+00
-2.253633E-01
-1.361497E+00
-2.027947E-01
-9.218086E-01
-9.573599E-02
-5.121545E-01
-3.102991E-02
-2.714593E-01
-8.321432E-03
-1.610373E-01
-3.861192E-03
-1.260213E-01
-2.059778E-03
-2.639926E-01
-8.553712E-03
-3.903656E-01
-2.120434E-02
-6.713558E-01
-6.787067E-02
-8.249516E-01
-8.014323E-02
-9.661898E-01
-1.164265E-01
-6.453827E-01
-4.960136E-02
-4.223368E-01
-2.321407E-02
-3.176142E-01
-1.194832E-02
-2.024477E-01
-5.524067E-03
-1.462501E-01
-3.549186E-03
-2.271669E-01
-6.331342E-03
-3.160296E-01
-1.372436E-02
-4.432888E-01
-2.126301E-02
-7.270762E-01
-6.487099E-02
-6.978494E-01
-5.538934E-02
-4.501793E-01
-2.531848E-02
-4.611865E-01
-2.432741E-02
-2.455689E-01
-8.366273E-03
-9.950167E-02
-1.901085E-03
-1.014830E-01
-1.540688E-03
-2.039189E-01
-7.545412E-03
-1.818539E-01
-3.576974E-03
-3.044983E-01
-1.423699E-02
-2.729832E-01
-1.331202E-02
-3.106891E-01
-1.144803E-02
-3.971745E-01
-1.721238E-02
-2.448524E-01
-6.977697E-03
-2.084599E-01
-5.955188E-03
-6.078377E-02
-5.442247E-04
-6.352672E-02
-7.273361E-04
-1.338729E-01
-2.922319E-03
-1.615985E-01
-3.901096E-03
-1.883691E-01
-4.541820E-03
-1.994268E-01
-4.419502E-03
-2.550700E-01
-1.011995E-02
-2.656566E-01
-8.538973E-03
-1.326436E-01
-2.700926E-03
-1.828790E-01
-4.860390E-03
-1.055978E-01
-2.086153E-03
-2.486040E-02
-1.152553E-04
-6.977514E-02
-7.637517E-04
-1.426015E-01
-2.562593E-03
-2.239382E-01
-7.615366E-03
-2.159614E-01
-6.154601E-03
-1.386893E-01
-3.229314E-03
-1.469009E-01
-2.610026E-03
-1.359445E-01
-2.208925E-03
-7.949674E-02
-1.090923E-03
-9.409645E-02
-1.796197E-03
-9.915992E-02
-1.496092E-03
-1.773128E-01
-4.163631E-03
-1.666022E-01
-5.373828E-03
-2.624372E-01
-8.835121E-03
-3.345364E-01
-1.299223E-02
-2.295291E-01
-6.890997E-03
-3.168143E-01
-1.633856E-02
-1.606576E-01
-4.742954E-03
-2.198036E-01
-5.376103E-03
-1.444186E-01
-3.197937E-03
-1.523611E-01
-2.626194E-03
-2.057216E-01
-5.184325E-03
-2.484219E-01
-8.065603E-03
-3.170831E-01
-1.371214E-02
-4.112561E-01
-2.349214E-02
-4.574564E-01
-2.381874E-02
-3.633926E-01
-1.532926E-02
-4.139000E-01
-1.844845E-02
-3.224482E-01
-1.294508E-02
-2.591168E-01
-8.231726E-03
-2.238452E-01
-8.182427E-03
-3.179609E-01
-1.267020E-02
-3.742188E-01
-1.866260E-02
-3.918803E-01
-2.306037E-02
-5.631822E-01
-4.613548E-02
-5.724671E-01
-3.647197E-02
-5.376124E-01
-3.468394E-02
-4.185970E-01
-1.861497E-02
-2.486122E-01
-8.141595E-03
-1.588234E-01
-3.825511E-03
-1.596044E-01
-3.435511E-03
-2.204163E-01
-5.757785E-03
-4.455893E-01
-2.579049E-02
-6.569462E-01
-4.890438E-02
-6.135941E-01
-4.664131E-02
-6.793213E-01
-5.401213E-02
-6.548499E-01
-4.947625E-02
-4.849197E-01
-2.856176E-02
-2.762591E-01
-9.482575E-03
-1.599354E-01
-3.980976E-03
-1.632220E-01
-4.266101E-03
-2.203472E-01
-7.096957E-03
-4.060220E-01
-1.794153E-02
-4.157637E-01
-2.024853E-02
-6.946025E-01
-5.477741E-02
-6.505924E-01
-4.666856E-02
-5.068244E-01
-3.491193E-02
-3.470484E-01
-1.737934E-02
-2.293816E-01
-7.685918E-03
-2.389629E-01
-8.850896E-03
-1.505995E-01
-2.876582E-03
-2.907994E-01
-1.195800E-02
-3.543847E-01
-1.568913E-02
-4.095750E-01
-1.979096E-02
-4.799528E-01
-2.728872E-02
-5.142024E-01
-3.024987E-02
-4.680612E-01
-2.551940E-02
-4.058385E-01
-2.310793E-02
-2.880766E-01
-1.175767E-02
-1.167011E-01
-2.057180E-03
-1.385494E-01
-3.784085E-03
-2.491848E-01
-7.449392E-03
-3.333697E-01
-1.223435E-02
-3.161041E-01
-1.234645E-02
-4.104319E-01
-2.113108E-02
-4.583192E-01
-2.651122E-02
-3.790470E-01
-1.851680E-02
-2.516503E-01
-7.415388E-03
-1.782866E-01
-3.900659E-03
-1.104557E-01
-2.248074E-03
-1.167308E-01
-3.039772E-03
-2.075736E-01
-7.064068E-03
-2.180168E-01
-6.336070E-03
-2.903925E-01
-9.489097E-03
-2.744247E-01
-9.030846E-03
-3.403069E-01
-1.268580E-02
-3.019064E-01
-1.052699E-02
-2.436311E-01
-7.489666E-03
-1.319666E-01
-2.817088E-03
-7.556566E-02
-8.976997E-04
-3.554724E-02
-4.034308E-04
-5.711633E-02
-4.306501E-04
-1.133366E-01
-1.754982E-03
-1.590142E-01
-3.260631E-03
-1.569202E-01
-3.503970E-03
-1.640218E-01
-3.672006E-03
-1.402148E-01
-3.495565E-03
-1.950403E-01
-6.678626E-03
-7.542042E-02
-1.053718E-03
-8.890472E-02
-1.315673E-03
-5.118031E-02
-4.782731E-04
-5.313139E-02
-5.751260E-04
-9.883790E-02
-1.983226E-03
-1.303960E-01
-2.333665E-03
-2.038247E-01
-5.452430E-03
-8.165890E-02
-9.243538E-04
-1.461825E-01
-3.217211E-03
-9.194982E-02
-1.221828E-03
-1.074998E-01
-3.217694E-03
-7.113698E-02
-8.980335E-04
-6.159336E-02
-7.871872E-04
-1.581280E-01
-3.230054E-03
-1.149541E-01
-1.639607E-03
-1.442538E-01
-3.516238E-03
-1.614780E-01
-3.943314E-03
-2.221209E-01
-6.094039E-03
-1.765576E-01
-5.283407E-03
-1.870343E-01
-4.582302E-03
-1.502824E-01
-2.786908E-03
-1.049316E-01
-1.560309E-03
-1.483976E-01
-3.461823E-03
-1.381855E-01
-3.483987E-03
-1.636269E-01
-3.625941E-03
-2.129101E-01
-6.053342E-03
-2.865882E-01
-9.222808E-03
-3.948129E-01
-1.754777E-02
-1.863158E-01
-4.282436E-03
-2.302657E-01
-6.040845E-03
-1.622669E-01
-3.583977E-03
-1.260152E-01
-2.175978E-03
-1.208627E-01
-2.044210E-03
-2.640979E-01
-8.849372E-03
-2.498718E-01
-9.012857E-03
-3.228690E-01
-1.113733E-02
-4.366129E-01
-2.169977E-02
-3.613345E-01
-1.386290E-02
-3.326626E-01
-1.382728E-02
-2.546343E-01
-8.375242E-03
-1.750139E-01
-3.956566E-03
-1.149909E-01
-1.553531E-03
-9.171613E-02
-1.258097E-03
-1.688854E-01
-3.626841E-03
-3.074559E-01
-1.128795E-02
-4.014122E-01
-1.892526E-02
-2.960858E-01
-1.062685E-02
-3.156364E-01
-1.221711E-02
-2.303342E-01
-5.911752E-03
-2.465437E-01
-7.303148E-03
-2.499264E-01
-7.462884E-03
-1.679361E-01
-3.415565E-03
-8.403406E-02
-1.398023E-03
-2.084519E-01
-6.333576E-03
-2.870835E-01
-9.368435E-03
-3.331424E-01
-1.418197E-02
-3.028572E-01
-9.995543E-03
-3.615811E-01
-1.447718E-02
-3.003659E-01
-9.829990E-03
-2.216267E-01
-5.579967E-03
-1.265740E-01
-2.312172E-03
-1.539258E-01
-3.811869E-03
-5.116714E-02
-3.766772E-04
-2.069794E-01
-4.706478E-03
-2.824890E-01
-9.829374E-03
-4.342550E-01
-2.175150E-02
-3.338091E-01
-1.258397E-02
-2.975162E-01
-9.543763E-03
-2.958141E-01
-1.060228E-02
-2.072746E-01
-5.809548E-03
-1.572435E-01
-3.553858E-03
-8.780067E-02
-1.080238E-03
-6.277077E-02
-8.146319E-04
-2.027002E-01
-4.880471E-03
-2.249296E-01
-6.801086E-03
-2.562026E-01
-7.985736E-03
-2.610332E-01
-8.341277E-03
-2.487859E-01
-6.745574E-03
-2.452106E-01
-7.276116E-03
-1.292894E-01
-2.441647E-03
-1.384975E-01
-2.258716E-03
-1.262151E-01
-2.266348E-03
-8.499870E-02
-1.048605E-03
-1.061529E-01
-1.352122E-03
-1.903736E-01
-5.558784E-03
-1.487595E-01
-2.773453E-03
-1.839791E-01
-4.150617E-03
-1.465408E-01
-2.813252E-03
-1.828928E-01
-4.248902E-03
-2.248261E-01
-6.983599E-03
-1.693010E-01
-3.303866E-03
-6.453527E-02
-1.173497E-03
-1.147332E-01
-3.617311E-03
-7.981911E-02
-8.325283E-04
-8.959341E-02
-1.548148E-03
-1.554108E-01
-4.270743E-03
-1.060675E-01
-1.816154E-03
-1.871862E-01
-4.742433E-03
-8.649749E-02
-1.100158E-03
-1.195635E-01
-1.740482E-03
-1.099096E-01
-1.964225E-03
-6.441028E-02
-7.477974E-04
-6.164448E-02
-1.090465E-03
-4.631552E-02
-5.181770E-04
-7.007983E-02
-7.319313E-04
-5.381387E-02
-3.817146E-04
-9.120379E-02
-1.840216E-03
-9.523925E-02
-1.956679E-03
-6.828427E-02
-8.825134E-04
-3.090110E-02
-1.871704E-04
-3.528248E-02
-2.289672E-04
-2.405019E-02
-9.740436E-05
-7.703115E-02
-8.995936E-04
-1.026207E-01
-1.722791E-03
-1.220668E-01
-2.216590E-03
-8.640530E-02
-1.102412E-03
-1.518321E-01
-3.298050E-03
-1.321954E-01
-2.553334E-03
-1.593152E-01
-4.604144E-03
-8.524427E-02
-1.055424E-03
-4.996523E-02
-5.024077E-04
-7.358073E-02
-1.128410E-03
-1.189640E-01
-2.194057E-03
-1.207644E-01
-2.491839E-03
-1.083314E-01
-1.503478E-03
-2.128070E-01
-7.648402E-03
-1.315274E-01
-2.025984E-03
-1.514078E-01
-3.617861E-03
-1.141892E-01
-2.085004E-03
-1.013844E-01
-1.496233E-03
-1.248655E-01
-2.516158E-03
-6.288783E-02
-9.200482E-04
-8.317750E-02
-1.508722E-03
-1.324137E-01
-3.423783E-03
-1.514092E-01
-3.487353E-03
-1.888798E-01
-5.346454E-03
-1.360192E-01
-2.392896E-03
-1.868095E-01
-3.836399E-03
-1.715305E-01
-3.663437E-03
-1.304944E-01
-1.999316E-03
-1.436264E-01
-3.567607E-03
-8.539019E-02
-1.065672E-03
-7.909923E-02
-1.167334E-03
-1.799124E-01
-4.569449E-03
-1.589893E-01
-3.478790E-03
-1.741005E-01
-3.674254E-03
-2.126076E-01
-6.791986E-03
-1.862610E-01
-4.406388E-03
-2.386545E-01
-6.839411E-03
-1.744812E-01
-4.301498E-03
-6.344775E-02
-6.567949E-04
-6.849881E-02
-7.535621E-04
-8.197852E-02
-9.887532E-04
-1.446787E-01
-3.971664E-03
-2.032184E-01
-5.194567E-03
-1.662525E-01
-3.292552E-03
-2.664800E-01
-8.114532E-03
-2.447963E-01
-7.854969E-03
-1.957695E-01
-5.152593E-03
-1.708599E-01
-4.101306E-03
-1.103539E-01
-2.077575E-03
-7.844092E-02
-1.163579E-03
-1.268702E-01
-2.695645E-03
-9.533912E-02
-1.278173E-03
-1.446874E-01
-3.872867E-03
-1.322553E-01
-2.335662E-03
-1.726451E-01
-3.517931E-03
-1.876877E-01
-4.835176E-03
-1.573863E-01
-3.574829E-03
-2.339589E-01
-7.282388E-03
-1.501104E-01
-2.820093E-03
-5.397296E-02
-5.850746E-04
-7.619565E-02
-1.435724E-03
-9.012995E-02
-1.564717E-03
-1.628327E-01
-3.377881E-03
-1.563374E-01
-3.245008E-03
-2.276467E-01
-7.079821E-03
-2.135994E-01
-7.272300E-03
-1.402939E-01
-2.997945E-03
-2.226852E-01
-6.770128E-03
-8.944673E-02
-1.404954E-03
-5.580544E-02
-9.620095E-04
-5.967367E-02
-1.011919E-03
-3.214966E-02
-1.717861E-04
-1.433931E-01
-2.788824E-03
-1.494058E-01
-2.846313E-03
-1.213890E-01
-3.277981E-03
-1.367546E-01
-2.740789E-03
-1.233601E-01
-2.166273E-03
-6.717077E-02
-9.275956E-04
-7.800745E-02
-8.928402E-04
-4.302808E-02
-5.599709E-04
-8.657826E-02
-1.515787E-03
-5.180954E-02
-5.871992E-04
-4.455245E-02
-4.150367E-04
-7.224886E-02
-8.834373E-04
-7.163514E-02
-8.735272E-04
-1.058744E-01
-2.396856E-03
-8.813243E-02
-1.064695E-03
-8.319821E-02
-2.457105E-03
-6.193848E-02
-6.865448E-04
-6.069918E-02
-6.588335E-04
diff --git a/tests/regression_tests/unstructured_mesh/test.py b/tests/regression_tests/unstructured_mesh/test.py
index 9ed36c69c..3c41ce78c 100644
--- a/tests/regression_tests/unstructured_mesh/test.py
+++ b/tests/regression_tests/unstructured_mesh/test.py
@@ -86,6 +86,18 @@ class UnstructuredMeshTest(PyAPITestHarness):
             data.shape = (data.size, 1)
         return np.sum(data, axis=1)
 
+    def update_results(self):
+        """Update results_true.dat and inputs_true.dat"""
+        try:
+            self._build_inputs()
+            inputs = self._get_inputs()
+            self._write_inputs(inputs)
+            self._overwrite_inputs()
+            self._run_openmc()
+            self._test_output_created()
+        finally:
+            self._cleanup()
+
     def _cleanup(self):
         super()._cleanup()
         output = glob.glob('tally*.vtk')
@@ -219,7 +231,7 @@ def model():
 
     space = openmc.stats.SphericalIndependent(r, cos_theta, phi)
     energy = openmc.stats.Discrete(x=[15.e+06], p=[1.0])
-    source = openmc.Source(space=space, energy=energy)
+    source = openmc.IndependentSource(space=space, energy=energy)
     settings.source = source
 
     model.settings = settings
diff --git a/tests/regression_tests/void/inputs_true.dat b/tests/regression_tests/void/inputs_true.dat
index 4e996c71d..7fee0779e 100644
--- a/tests/regression_tests/void/inputs_true.dat
+++ b/tests/regression_tests/void/inputs_true.dat
@@ -113,7 +113,7 @@
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>3</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/void/test.py b/tests/regression_tests/void/test.py
index af1e3887b..76c15eb39 100644
--- a/tests/regression_tests/void/test.py
+++ b/tests/regression_tests/void/test.py
@@ -23,7 +23,7 @@ def model():
     model.settings.run_mode = 'fixed source'
     model.settings.batches = 3
     model.settings.particles = 1000
-    model.settings.source = openmc.Source(space=openmc.stats.Point())
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point())
 
     cell_filter = openmc.CellFilter(cells)
     tally = openmc.Tally()
diff --git a/tests/regression_tests/weightwindows/inputs_true.dat b/tests/regression_tests/weightwindows/inputs_true.dat
index 16966ccaf..c40f4b761 100644
--- a/tests/regression_tests/weightwindows/inputs_true.dat
+++ b/tests/regression_tests/weightwindows/inputs_true.dat
@@ -34,7 +34,7 @@
     <run_mode>fixed source</run_mode>
     <particles>200</particles>
     <batches>2</batches>
-    <source strength="1.0">
+    <source particle="neutron" strength="1.0" type="independent">
       <space type="point">
         <parameters>0.001 0.001 0.001</parameters>
       </space>
diff --git a/tests/regression_tests/weightwindows/test.py b/tests/regression_tests/weightwindows/test.py
index b7a0e4fe1..9ed855976 100644
--- a/tests/regression_tests/weightwindows/test.py
+++ b/tests/regression_tests/weightwindows/test.py
@@ -53,7 +53,7 @@ def model():
     space = Point((0.001, 0.001, 0.001))
     energy = Discrete([14E6], [1.0])
 
-    settings.source = openmc.Source(space=space, energy=energy)
+    settings.source = openmc.IndependentSource(space=space, energy=energy)
 
     # tally
     mesh = openmc.RegularMesh()
diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
index 51d1b19a3..6041d8982 100644
--- a/tests/unit_tests/conftest.py
+++ b/tests/unit_tests/conftest.py
@@ -48,7 +48,7 @@ def sphere_model():
     model.settings.particles = 100
     model.settings.batches = 10
     model.settings.run_mode = 'fixed source'
-    model.settings.source = openmc.Source(space=openmc.stats.Point())
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point())
     return model
 
 
diff --git a/tests/unit_tests/dagmc/test.py b/tests/unit_tests/dagmc/test.py
index 072167e79..e84b5317e 100644
--- a/tests/unit_tests/dagmc/test.py
+++ b/tests/unit_tests/dagmc/test.py
@@ -27,7 +27,7 @@ def dagmc_model(request):
     model.settings.verbosity = 1
     source_box = openmc.stats.Box([ -4, -4, -4 ],
                                   [  4,  4,  4 ])
-    source = openmc.Source(space=source_box)
+    source = openmc.IndependentSource(space=source_box)
     model.settings.source = source
 
     # geometry
diff --git a/tests/unit_tests/mesh_to_vtk/test_vtk_dims.py b/tests/unit_tests/mesh_to_vtk/test_vtk_dims.py
index f7f5af8d0..4f23ef859 100644
--- a/tests/unit_tests/mesh_to_vtk/test_vtk_dims.py
+++ b/tests/unit_tests/mesh_to_vtk/test_vtk_dims.py
@@ -25,7 +25,7 @@ def model():
     settings.particles = 100
     settings.run_mode = 'fixed source'
 
-    source = openmc.Source()
+    source = openmc.IndependentSource()
     source.angle = openmc.stats.Isotropic()
     source.energy = openmc.stats.Discrete([1.0e6], [1.0])
     source.space = openmc.stats.Point((-0.01, -0.01, -0.01))
diff --git a/tests/unit_tests/test_complex_cell_bb.py b/tests/unit_tests/test_complex_cell_bb.py
index ad6491cca..8a94d9ddc 100644
--- a/tests/unit_tests/test_complex_cell_bb.py
+++ b/tests/unit_tests/test_complex_cell_bb.py
@@ -66,7 +66,7 @@ def complex_cell(run_in_tmpdir, mpi_intracomm):
     model.settings.batches = 10
     model.settings.inactive = 5
     model.settings.particles = 100
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         [-10., -10., -1.], [10., 10., 1.]))
 
     model.settings.verbosity = 1
diff --git a/tests/unit_tests/test_cylindrical_mesh.py b/tests/unit_tests/test_cylindrical_mesh.py
index 4382b49ba..22b6ed816 100644
--- a/tests/unit_tests/test_cylindrical_mesh.py
+++ b/tests/unit_tests/test_cylindrical_mesh.py
@@ -23,7 +23,7 @@ def model():
 
     geom = openmc.Geometry([cell])
 
-    source = openmc.Source()
+    source = openmc.IndependentSource()
     source.space = openmc.stats.Point()
     source.energy = openmc.stats.Discrete([10000], [1.0])
 
@@ -155,7 +155,7 @@ def _check_void_cylindrical_tally(statepoint_filename):
         assert neutron_flux == pytest.approx(d_r)
 
 def test_void_geom_pnt_src(run_in_tmpdir, void_coincident_geom_model):
-    src = openmc.Source()
+    src = openmc.IndependentSource()
     src.space = openmc.stats.Point()
     src.angle = openmc.stats.PolarAzimuthal(mu=openmc.stats.Discrete([0.0], [1.0]))
     src.energy = openmc.stats.Discrete([14.06e6], [1])
@@ -180,7 +180,7 @@ def test_void_geom_boundary_src(run_in_tmpdir, void_coincident_geom_model):
 
     energy = openmc.stats.Discrete([14.06e6], [1])
     for val in radial_vals:
-        src = openmc.Source()
+        src = openmc.IndependentSource()
         src.energy = energy
 
         pnt = np.array([np.cos(val), np.sin(val), 0.0])
diff --git a/tests/unit_tests/test_data_thermal.py b/tests/unit_tests/test_data_thermal.py
index 61ae61b24..9f5a8cb40 100644
--- a/tests/unit_tests/test_data_thermal.py
+++ b/tests/unit_tests/test_data_thermal.py
@@ -363,7 +363,7 @@ def test_mixed_elastic(fake_mixed_elastic, run_in_tmpdir):
     model.settings.particles = 1000
     model.settings.batches = 10
     model.settings.run_mode = 'fixed source'
-    model.settings.source = openmc.Source(
+    model.settings.source = openmc.IndependentSource(
         energy=openmc.stats.Discrete([3.0], [1.0])  # 3 eV source
     )
     model.run()
diff --git a/tests/unit_tests/test_deplete_activation.py b/tests/unit_tests/test_deplete_activation.py
index 539f4d6bd..357e303cd 100644
--- a/tests/unit_tests/test_deplete_activation.py
+++ b/tests/unit_tests/test_deplete_activation.py
@@ -27,7 +27,7 @@ def model():
 
     model.settings.batches = 10
     model.settings.particles = 1000
-    model.settings.source = openmc.Source(
+    model.settings.source = openmc.IndependentSource(
         space=openmc.stats.Point(),
         energy=openmc.stats.Discrete([1.0e6], [1.0])
     )
diff --git a/tests/unit_tests/test_energy_cutoff.py b/tests/unit_tests/test_energy_cutoff.py
index fb82c579a..45333f2e1 100644
--- a/tests/unit_tests/test_energy_cutoff.py
+++ b/tests/unit_tests/test_energy_cutoff.py
@@ -17,7 +17,7 @@ def inf_medium_model(cutoff_energy, source_energy):
     model.geometry = openmc.Geometry([cell])
 
     model.settings.run_mode = 'fixed source'
-    model.settings.source = openmc.Source(
+    model.settings.source = openmc.IndependentSource(
         particle='photon',
         energy=openmc.stats.Discrete([source_energy], [1.0]),
     )
diff --git a/tests/unit_tests/test_filters.py b/tests/unit_tests/test_filters.py
index 0d34bfee3..ff064d5c2 100644
--- a/tests/unit_tests/test_filters.py
+++ b/tests/unit_tests/test_filters.py
@@ -17,7 +17,7 @@ def box_model():
     model.settings.particles = 100
     model.settings.batches = 10
     model.settings.inactive = 0
-    model.settings.source = openmc.Source(space=openmc.stats.Point())
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point())
     return model
 
 
diff --git a/tests/unit_tests/test_geometry.py b/tests/unit_tests/test_geometry.py
index 3b2deee28..6fa34d26d 100644
--- a/tests/unit_tests/test_geometry.py
+++ b/tests/unit_tests/test_geometry.py
@@ -20,7 +20,7 @@ def test_volume(run_in_tmpdir, uo2):
     model.settings.particles = 100
     model.settings.batches = 10
     model.settings.run_mode = 'fixed source'
-    model.settings.source = openmc.Source(space=openmc.stats.Point())
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point())
 
     ll, ur = model.geometry.bounding_box
     assert ll == pytest.approx((-outer.r, -outer.r, -outer.r))
diff --git a/tests/unit_tests/test_lib.py b/tests/unit_tests/test_lib.py
index b4dd9197b..5f74c7c23 100644
--- a/tests/unit_tests/test_lib.py
+++ b/tests/unit_tests/test_lib.py
@@ -66,7 +66,7 @@ def uo2_trigger_model():
     model.settings.batches = 10
     model.settings.inactive = 5
     model.settings.particles = 100
-    model.settings.source = openmc.Source(space=openmc.stats.Box(
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         [-0.5, -0.5, -1], [0.5, 0.5, 1], only_fissionable=True))
     model.settings.verbosity = 1
     model.settings.keff_trigger = {'type': 'std_dev', 'threshold': 0.001}
@@ -849,7 +849,7 @@ def test_sample_external_source(run_in_tmpdir, mpi_intracomm):
     cell = openmc.Cell(fill=mat, region=-sph)
     model = openmc.Model()
     model.geometry = openmc.Geometry([cell])
-    model.settings.source = openmc.Source(
+    model.settings.source = openmc.IndependentSource(
         space=openmc.stats.Box([-5., -5., -5.], [5., 5., 5.]),
         angle=openmc.stats.Monodirectional((0., 0., 1.)),
         energy=openmc.stats.Discrete([1.0e5], [1.0])
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index 6c483aeb9..f78f95637 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -59,7 +59,7 @@ def pin_model_attributes():
     bounds = [-0.62992, -0.62992, -1, 0.62992, 0.62992, 1]
     uniform_dist = openmc.stats.Box(
         bounds[:3], bounds[3:], only_fissionable=True)
-    settings.source = openmc.source.Source(space=uniform_dist)
+    settings.source = openmc.IndependentSource(space=uniform_dist)
 
     entropy_mesh = openmc.RegularMesh()
     entropy_mesh.lower_left = [-0.39218, -0.39218, -1.e50]
diff --git a/tests/unit_tests/test_settings.py b/tests/unit_tests/test_settings.py
index 15e86ca61..d75a50477 100644
--- a/tests/unit_tests/test_settings.py
+++ b/tests/unit_tests/test_settings.py
@@ -13,7 +13,7 @@ def test_export_to_xml(run_in_tmpdir):
     s.energy_mode = 'continuous-energy'
     s.max_order = 5
     s.max_tracks = 1234
-    s.source = openmc.Source(space=openmc.stats.Point())
+    s.source = openmc.IndependentSource(space=openmc.stats.Point())
     s.output = {'summary': True, 'tallies': False, 'path': 'here'}
     s.verbosity = 7
     s.sourcepoint = {'batches': [50, 150, 500, 1000], 'separate': True,
@@ -71,7 +71,7 @@ def test_export_to_xml(run_in_tmpdir):
     assert s.energy_mode == 'continuous-energy'
     assert s.max_order == 5
     assert s.max_tracks == 1234
-    assert isinstance(s.source[0], openmc.Source)
+    assert isinstance(s.source[0], openmc.IndependentSource)
     assert isinstance(s.source[0].space, openmc.stats.Point)
     assert s.output == {'summary': True, 'tallies': False, 'path': 'here'}
     assert s.verbosity == 7
diff --git a/tests/unit_tests/test_source.py b/tests/unit_tests/test_source.py
index 1e4766b45..4783ff8f1 100644
--- a/tests/unit_tests/test_source.py
+++ b/tests/unit_tests/test_source.py
@@ -4,6 +4,7 @@ import openmc
 import openmc.lib
 import openmc.stats
 import numpy as np
+import pytest
 from pytest import approx
 
 
@@ -12,7 +13,7 @@ def test_source():
     energy = openmc.stats.Discrete([1.0e6], [1.0])
     angle = openmc.stats.Isotropic()
 
-    src = openmc.Source(space=space, angle=angle, energy=energy)
+    src = openmc.IndependentSource(space=space, angle=angle, energy=energy)
     assert src.space == space
     assert src.angle == angle
     assert src.energy == energy
@@ -23,7 +24,7 @@ def test_source():
     assert elem.find('angle') is not None
     assert elem.find('energy') is not None
 
-    src = openmc.Source.from_xml_element(elem)
+    src = openmc.IndependentSource.from_xml_element(elem)
     assert isinstance(src.angle, openmc.stats.Isotropic)
     assert src.space.xyz == [0.0, 0.0, 0.0]
     assert src.energy.x == [1.0e6]
@@ -49,8 +50,8 @@ def test_spherical_uniform():
 
 def test_source_file():
     filename = 'source.h5'
-    src = openmc.Source(filename=filename)
-    assert src.file == filename
+    src = openmc.FileSource(path=filename)
+    assert src.path == filename
 
     elem = src.to_xml_element()
     assert 'strength' in elem.attrib
@@ -59,7 +60,7 @@ def test_source_file():
 
 def test_source_dlopen():
     library = './libsource.so'
-    src = openmc.Source(library=library)
+    src = openmc.CompiledSource(library=library)
     assert src.library == library
 
     elem = src.to_xml_element()
@@ -75,14 +76,14 @@ def test_source_xml_roundtrip():
         phi=openmc.stats.Uniform(0., 2*pi),
         reference_uvw=(0., 1., 0.)
     )
-    src = openmc.Source(
+    src = openmc.IndependentSource(
         space=space, angle=angle, energy=energy,
         particle='photon', strength=100.0
     )
     elem = src.to_xml_element()
 
     # Read from XML element and make sure data is preserved
-    new_src = openmc.Source.from_xml_element(elem)
+    new_src = openmc.IndependentSource.from_xml_element(elem)
     assert isinstance(new_src.space, openmc.stats.Box)
     np.testing.assert_allclose(new_src.space.lower_left, src.space.lower_left)
     np.testing.assert_allclose(new_src.space.upper_right, src.space.upper_right)
@@ -120,7 +121,7 @@ def test_rejection(run_in_tmpdir):
 
     # Set up a box source with rejection on the spherical cell
     space = openmc.stats.Box(*cell3.bounding_box)
-    model.settings.source = openmc.Source(space=space, domains=[cell1, cell2])
+    model.settings.source = openmc.IndependentSource(space=space, domains=[cell1, cell2])
 
     # Load up model via openmc.lib and sample source
     model.export_to_xml()
@@ -134,3 +135,25 @@ def test_rejection(run_in_tmpdir):
         assert p.r not in non_source_region
 
     openmc.lib.finalize()
+
+
+def test_exceptions():
+
+    with pytest.raises(AttributeError, match=r'Please use the FileSource class'):
+        s = openmc.IndependentSource()
+        s.file = 'my_file'
+
+    with pytest.raises(AttributeError, match=r'Please use the CompiledSource class'):
+        s = openmc.IndependentSource()
+        s.library = 'my_library'
+
+    with pytest.raises(AttributeError, match=r'Please use the CompiledSource class'):
+        s = openmc.IndependentSource()
+        s.parameters = 'my_params'
+
+    with pytest.warns(FutureWarning, match=r'in favor of \'IndependentSource\''):
+        s = openmc.Source()
+
+    with pytest.raises(AttributeError, match=r'has no attribute \'frisbee\''):
+        s = openmc.IndependentSource()
+        s.frisbee
\ No newline at end of file
diff --git a/tests/unit_tests/test_source_file.py b/tests/unit_tests/test_source_file.py
index 78115a1f6..ec10260ba 100644
--- a/tests/unit_tests/test_source_file.py
+++ b/tests/unit_tests/test_source_file.py
@@ -67,7 +67,7 @@ def test_wrong_source_attributes(run_in_tmpdir):
     settings =  openmc.Settings()
     settings.particles = 100
     settings.batches = 10
-    settings.source = openmc.Source(filename='animal_source.h5')
+    settings.source = openmc.FileSource(path='animal_source.h5')
     settings.export_to_xml()
 
     # When we run the model, it should error out with a message that includes
@@ -90,7 +90,7 @@ def test_source_file_transport(run_in_tmpdir):
     sph = openmc.Sphere(r=10.0, boundary_type='vacuum')
     cell = openmc.Cell(fill=al, region=-sph)
     model.geometry = openmc.Geometry([cell])
-    model.settings.source = openmc.Source(filename='source.h5')
+    model.settings.source = openmc.FileSource(path='source.h5')
     model.settings.particles = 10
     model.settings.batches = 3
     model.settings.run_mode = 'fixed source'
diff --git a/tests/unit_tests/test_source_mesh.py b/tests/unit_tests/test_source_mesh.py
index 596b22f9a..fd8b04148 100644
--- a/tests/unit_tests/test_source_mesh.py
+++ b/tests/unit_tests/test_source_mesh.py
@@ -94,7 +94,7 @@ def test_unstructured_mesh_sampling(model, request, test_cases):
     space = openmc.stats.MeshSpatial(uscd_mesh, strengths, vol_norm)
 
     energy = openmc.stats.Discrete(x=[15.e+06], p=[1.0])
-    source = openmc.Source(space=space, energy=energy)
+    source = openmc.IndependentSource(space=space, energy=energy)
     model.settings.source = source
 
     with cdtemp([mesh_filename]):
@@ -155,7 +155,7 @@ def test_strengths_size_failure(request, model):
     space = openmc.stats.MeshSpatial(uscd_mesh, strengths)
 
     energy = openmc.stats.Discrete(x=[15.e+06], p=[1.0])
-    source = openmc.Source(space=space, energy=energy)
+    source = openmc.IndependentSource(space=space, energy=energy)
     model.settings.source = source
 
     # skip the test if unstructured mesh is not available
@@ -188,7 +188,7 @@ def test_roundtrip(run_in_tmpdir, model, request):
 
     space_out = openmc.MeshSpatial(ucd_mesh)
     space_out.strengths = np.random.rand(n_cells*TETS_PER_VOXEL)
-    model.settings.source = openmc.Source(space=space_out)
+    model.settings.source = openmc.IndependentSource(space=space_out)
 
     # write out the model
     model.export_to_xml()
diff --git a/tests/unit_tests/test_spherical_mesh.py b/tests/unit_tests/test_spherical_mesh.py
index ac2781378..80f65bb42 100644
--- a/tests/unit_tests/test_spherical_mesh.py
+++ b/tests/unit_tests/test_spherical_mesh.py
@@ -23,7 +23,7 @@ def model():
 
     geom = openmc.Geometry([cell])
 
-    source = openmc.Source()
+    source = openmc.IndependentSource()
     source.space = openmc.stats.Point()
     source.energy = openmc.stats.Discrete([10000], [1.0])
 
@@ -163,7 +163,7 @@ def _check_void_spherical_tally(statepoint_filename):
 
 def test_void_geom_pnt_src(run_in_tmpdir, void_coincident_geom_model):
     # add isotropic point source
-    src = openmc.Source()
+    src = openmc.IndependentSource()
     src.space = openmc.stats.Point()
     src.energy = openmc.stats.Discrete([14.06e6], [1])
     void_coincident_geom_model.settings.source = src
@@ -190,7 +190,7 @@ def test_void_geom_boundary_src(run_in_tmpdir, void_coincident_geom_model):
 
     for phi, theta in zip(phi_vals, theta_vals):
 
-        src = openmc.Source()
+        src = openmc.IndependentSource()
         src.energy = energy
 
         pnt = np.array([np.sin(phi)*np.cos(theta), np.sin(phi)*np.sin(theta), np.cos(phi)])
diff --git a/tests/unit_tests/test_time_filter.py b/tests/unit_tests/test_time_filter.py
index 45fabc544..b57c80a97 100644
--- a/tests/unit_tests/test_time_filter.py
+++ b/tests/unit_tests/test_time_filter.py
@@ -59,7 +59,7 @@ def model(request):
     model.settings.particles = 1000
     model.settings.batches = 20
     particle = request.param
-    model.settings.source = openmc.Source(
+    model.settings.source = openmc.IndependentSource(
         space=openmc.stats.Point((x, 0., 0.)),
         angle=openmc.stats.Monodirectional([-1., 0., 0.]),
         energy=openmc.stats.Discrete([E], [1.0]),
@@ -100,7 +100,7 @@ def model_surf(request):
     model.settings.particles = 1000
     model.settings.batches = 20
     particle = request.param
-    model.settings.source = openmc.Source(
+    model.settings.source = openmc.IndependentSource(
         space=openmc.stats.Point((0., 0., 0.)),
         angle=openmc.stats.Monodirectional([1., 0., 0.]),
         energy=openmc.stats.Discrete([E], [1.0]),
@@ -165,7 +165,7 @@ def test_small_time_interval(run_in_tmpdir):
     model.settings.particles = 100
     model.settings.batches = 10
     model.settings.run_mode = 'fixed source'
-    model.settings.source = openmc.Source(
+    model.settings.source = openmc.IndependentSource(
         time=openmc.stats.Discrete([1.0e8], [1.0]),
         particle='photon'
     )
diff --git a/tests/unit_tests/test_torus.py b/tests/unit_tests/test_torus.py
index ba92860e7..8c413ffe0 100644
--- a/tests/unit_tests/test_torus.py
+++ b/tests/unit_tests/test_torus.py
@@ -17,7 +17,7 @@ def get_torus_keff(cls, R, r, center=(0, 0, 0)):
     outer_cell = openmc.Cell(region=+torus & -sphere)
     model.geometry = openmc.Geometry([torus_cell, outer_cell])
 
-    model.settings.source = openmc.Source(space=openmc.stats.Point(center))
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point(center))
     model.settings.batches = 10
     model.settings.inactive = 5
     model.settings.particles = 1000
diff --git a/tests/unit_tests/test_tracks.py b/tests/unit_tests/test_tracks.py
index be75c6f88..3a0170155 100644
--- a/tests/unit_tests/test_tracks.py
+++ b/tests/unit_tests/test_tracks.py
@@ -48,7 +48,7 @@ def test_tracks(sphere_model, particle, run_in_tmpdir):
     sphere_model.settings.track = [(1, 1, 1), (1, 1, 10), (2, 1, 15)]
 
     # Set source particle
-    sphere_model.settings.source = openmc.Source(particle=particle)
+    sphere_model.settings.source = openmc.IndependentSource(particle=particle)
 
     # Run OpenMC to generate tracks.h5 file
     generate_track_file(sphere_model)
diff --git a/tests/unit_tests/test_urr_capture.py b/tests/unit_tests/test_urr_capture.py
index 745d62cef..34b518e9d 100644
--- a/tests/unit_tests/test_urr_capture.py
+++ b/tests/unit_tests/test_urr_capture.py
@@ -19,7 +19,7 @@ def th232_model():
     model.settings.batches = 10
     model.settings.run_mode = 'fixed source'
     energies = openmc.stats.Uniform(e_min, e_max)
-    model.settings.source = openmc.Source(energy=energies)
+    model.settings.source = openmc.IndependentSource(energy=energies)
 
     tally = openmc.Tally(name='rates')
     tally.filters = [openmc.EnergyFilter([e_min, e_max])]
diff --git a/tests/unit_tests/weightwindows/test.py b/tests/unit_tests/weightwindows/test.py
index dce75c740..f8db66820 100644
--- a/tests/unit_tests/weightwindows/test.py
+++ b/tests/unit_tests/weightwindows/test.py
@@ -99,7 +99,7 @@ def model():
     space = Point((0.001, 0.001, 0.001))
     energy = Discrete([14E6], [1.0])
 
-    settings.source = openmc.Source(space=space, energy=energy)
+    settings.source = openmc.IndependentSource(space=space, energy=energy)
 
     # tally
     mesh = openmc.RegularMesh()