Added warmup condition