added -calc command