Some changes/update to first_run.