leo: changes for ion;