Second version

Performance Hack second version, nedd test for this.
Removed inesesary option