changes to match comments from @dd