A few changes

Here we are