adjust first run logic