Checked some optimization
..