add check for more calculations