Edata replacing bugs fixed