ICS+ optimizations