Update based on feedback from Ravi