Changed some more things