Changed some more