Updated Calculus and Optim packages