Modified files for use with Python 3.x