Milind's changes