added more calculations