Finished Bernhard's first edits