SOme modification done