Ankit and mine changes merged