Changed the code