Improved table + correction in calculation