updateing pushpita's code