edits to master.py