Now might work with python 2