Commented out python code to merge a few changes into master