Changed pretty much everything

Now it works properly XD