Added changes from crashed disk.