Version 2.0 2021.10.22
Better accuracy