Changed some things
remove