Oops, readding back Ryan's changes
And now reading the new Backup section. Should be now merged right.