update 25.05 + new calculation