Working through some bugs - back to Python2.7