Some performance tuning...