improve first-run