More tuning of main method.