Added option to compute tuning parameters