Separate update and copy drive file functions
Merge previous changes