Make eip more easily editable