updated stuff
Moved stuff around