Commented out my unit conversions and replaced with more comprehensive solution