Modified control.py and config.py