Switched calculations to interpolation scheme that will not break will NaNs at the end -- should eventually be removed completely as there is already an interpolation scheme in place.