modified few lines