Checkpoint
Changes for python3