cleaned up owner checking