start of restore feature 17