Improved warmup