Some changes to main.py