Did some optimization.