Modified changes by akshat