New changes done as per issues