simplified restore, temp fix