re-wrote warmup