Changed some Things