Changes in main.py