More major changes

It works even better now