Changed the Code