Edits to unit
merged