Optimization another part implemented.