More efficiency

Now the project use an other method
More efficient