separated calculator into risk and normal