more changes from main.py