Converted to python 3 support