Added warmup and changed waits
Fixing merge conflict