Python script changes
Merged with better .py file