still merging with osborn