Additions to main.py