Merge with hongkun. It includes dropbox logic.