Optimize wait states