Updating based on Ambuj's feedback.