more optimizations ...