Now i made changes