Edits to #300