Merged Krisna's change into mine