Updates based on feedback from Chethan.