Bunch of changes and an error to know it's working