edits as discussed in #54