merging with eddlib