Fixed, delete EH, WIP