More edits plus stub completion