Added new functionality to run.py