Removed References; Changed to $hi and $oi