Adding Rahuls changes

Adding Rahuls changes