Manually merged in coments from Bala.