Optimized previous commit a bit more