Naive2Opt partly optimized and started on Naive3Opt