Version 1.1 2022.06.24
Optimized some calculations