Adding back in g_doWarmup and friends