jh: grunley edits