better backup handling