improved (maybe) first run behaviour