ion changes

Change-Id: Ib7fef75dd5c15f0b377fb6f32afcfd1f86afde66