Added some stuff
More changes