merge with Jeff
fixed