Attempted to get rid of backup buffer files
Merged in backup changes with ecb changes