Updating for compatibility with python 2