Updated with latest changes from dropbox