Manually commit in E case changes and fix previous merge
Re-oxygenize