Improved the backup procedure quite a bit