Checkpoint before changing dropbox implementation