update per Greg's suggestion