Finish VAhid And syruses edits