apply @dtrejo's edits for #1