merged updates fron task1's index.py into task 2