local ubuntu edits
merged local edits