removing warmup and fixing empty