More changes by kunal