A few changes to calculations