Moved some more calculations.