made all the nessary changes