Reformmated data
merge main.py
Pushing everything