Minor modification. May actually be useless