- more optimizations