pushing the previous optimizations a bit further
Merge branch 'optimizations'