finish warmup and add some sort