V3.0

Skipped a whole iterations XD.

Just changes to code. Improving it, optimizations etc disposing of
duplicate code.