Updated stuff
more changes