updated from first runthru