incorporating sandeep's suggestions