changes done as per assingment