My second commit

* It's actually the fourth commit from the training
* It fixes a lot