Changed some Code