Changed some things on the code for more clarity since a lot of things to do on that poinr