EOR is in. Needs testing