New changes  DB And code