Last commit, moved to python 3