Feature/eg 268