few changes to first run