Small changes based on Ashvin's comments