Added PY3 changes