merging with gedas updates