Added some tuning and specs