Update for python 2