added performance tuning