Adjusted code so that SOIL is no longer a dependency.