Added some tuning