New changes of my code