Further edits to extern