DS:Corrected some parts of code