reduced runtime changes