This goes with the previous commit - python 3 changes