More tunning for second run