ENH:DBM's edits