Update after testing out some calcs; no major code change