tweaked version, and released