changed somewhat, too long ago