edits to satisfy r check