Update with new changes, check the readme