Some changes in main.py