More changes towards first run