Added some tuning parameters