Redone some things
Redone some things