Engine 2.0 further rework