Did some work on restore