More changes in main code