integrated Sandeep's changes