structure optimizations again.