Added multiple calculations option