move this out of if owner