more progress on rebuild