merging in changes from EC