with Rajiv's corrections