Solution 150 version 4 minor optimizations