Change some things
This is how it should be