Reworked first run to be more user friendly