before Jeff
changed types