Improve first run