added some more calculations