Added Python 2/3 stuff again...