design changes

design optimizations