add some more calculations