Improvement of the Tech Calc 2.0 countries version