add jim's suggestions