More Work on restore