update main.py from local develop branch 2