Add Greg's changes.