included Ray's comment missed earlier
hopefully final version