BEFORE EFCODE CHANGES