Prepare for EF 98