merging dale's edits