Optimization check added