Changes by Oi I guess