Bhavesh's changes