added more timings for better tuning