fixed, improved calculations. parallel