Updated with Dropbox version
commit 7