speep improvement and slight changes to the calculations