Updated to hopefully fix issues with certain values being multiplied that shouldn't be.