Misc Restoration

Aaa: aaa