Changed some of the Code