Jayanth's advice in comments