added RTI groups, optimizations