Further changes in main.