Use a lookup table with interpolation instead of proportions
Update tests